progress
Merge branch 'master' into submissions
Major refactoring of business logic and directives
Auto-refresh
More unit tests added
Updated Gruntfile to include views/templates when building