Updates

Charlie Chiurequested to merge
updates into master
  • removed scripts
  • updated all templates
  • still need to be revised

Merge request reports