(#52) Fixed templates for AngularJS 1.3 compatibility
Merge branch 'feature/52-upgrade-angularjs-rebase'

* feature/52-upgrade-angularjs-rebase:
  (#52) Fixed templates for AngularJS 1.3 compatibility