Added a better error message when a session expires.
removed this <button ng-click="blargy()">abutton</button>
UI update to contacts
help text changes for CP
Merge branch 'master' of https://github.com/scbd/absch.cbd.int
Merge branch 'master' into feature/newregister

Conflicts:
	app/js/boot.js
	app/views/register.html
	app/views/register.html.js