Merge branch 'Gruntfile_Watch'
Fixed issue with raw angular templates showing up while scripts are loading.
Merge branch 'Fix_FOUC' into production