MAP-199 :Resolve service jpa TODOs
MAP-226: Modify shade of bgcolor grey
MAP-227: Notes hidden from viewer role
MAP-228: Viewer should only see PUBLISHED records
MAP-230: Advice list should be alpha sorted
MAP-190: Recreate header and footer as ng-include elements instead of directives
MAP-224: Remove non-IHTSDO email addresses
MAP-229 - Set rule default on map entry to TRUE or previously set.
MAP-190: Recreate header and footer as ng-include elements instead of directives
MAP-168: As an admin, I need the javascript libraries to be un-minified for development and minified for deployment.
MAP-240: Metadata widget only for admin users
MAP-250 Change the word “concept” to “code”
MAP-249 Change the word “name” to preferred term
CLEANUP: Remove minify plugin that didn't work
MAP-252 Initial work for Finish/Next button
Merge branch 'master' of https://github.com/WestCoastInformatics/OTF-Mapping-Service

Conflicts:
	webapp/src/main/webapp/app/js/controllers.js
	webapp/src/main/webapp/app/partials/record-concept.html