Put proper keys on master services.js

Somehow the develop-branch-only version got merged
Merge pull request #57 from JohnThomson/feature/resetMasterKeys

Feature/reset master keys
Add notes on configuring TeamCity build
Merge pull request #58 from JohnThomson/feature/uploadNotes

Add notes on configuring TeamCity build
Merge branch 'develop' into merge/developToMaster1
Merge pull request #62 from JohnThomson/merge/developToMaster1

Merge/develop to master1
Merge pull request #66 from JohnThomson/feature/removeGreyShowPassword

Feature/remove grey show password
Upgrade gruntfile.js (from ngboilerplate) to the version that uses grunt-contrib-less instead of 'recess' for making less files, and in the process get  the ability to make sourcemaps. Also had to reinstate the build_vendorcss task, which was gone from that.
Various html and stylesheet tweeaks
Merge remote-tracking branch 'origin/develop'