bug fixes, publishing
Many updates / bug fixes
Merge branch 'master' of https://github.com/MySmallfish/SAMS

Conflicts:
	src/Portal/app/competitions/controllers/competitions.js
	src/Portal/app/competitions/controllers/open-registration.js