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

Conflicts:
	src/Portal/Web.config
Added controllers and skeleton for services
Merge branch 'master' of https://github.com/MySmallfish/SAMS