line-up
Merge branch 'master' of https://github.com/MySmallfish/SAMS

Conflicts:
	src/Portal/app/common/resources.js
	src/Portal/app/members/services/members-manager.js