Bug fixes
Merge branch 'master' of https://github.com/MySmallfish/SAMS

Conflicts:
	src/Portal/app/common/directives/grid.js
	src/Portal/app/competitions/controllers/competition-registration.js