MAP-190: Recreate header and footer as ng-include elements instead of directives
Merge branch 'master' of https://github.com/WestCoastInformatics/OTF-Mapping-Service

Conflicts:
	webapp/src/main/webapp/app/js/directives.js
	webapp/src/main/webapp/app/partials/doc/LeadDashboardHelp.html
	webapp/src/main/webapp/app/partials/doc/SpecialistDashboardHelp.html
	webapp/src/main/webapp/app/partials/doc/ViewerDashboardHelp.html
	webapp/src/main/webapp/app/partials/doc/conceptHelp.html
	webapp/src/main/webapp/app/partials/doc/editDashboardHelp.html
	webapp/src/main/webapp/app/partials/doc/loginHelp.html
	webapp/src/main/webapp/app/partials/doc/projectHelp.html
	webapp/src/main/webapp/app/partials/doc/recordsHelp.html
	webapp/src/main/webapp/app/partials/doc/resolveConflictsDashboardHelp.html
	webapp/src/main/webapp/app/partials/login.html
	webapp/src/main/webapp/app/partials/record-concept.html
	webapp/src/main/webapp/app/partials/record-dashboard.html
	webapp/src/main/webapp/app/partials/record-detail.html
MAP-190 :Recreate header and footer as ng-include elements instead of directives
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/login.html