Switch from ngmin to ng-annotate
Merge branch 'master' into build
Rebuild following switch to ng-annotate