Server-Side US#40
Merge branch 'development' of github.com:fachexot/AMOS-SoftwareForge into development

Conflicts:
	SoftwareForge.Mvc/SoftwareForge.Mvc/WebApiClient/TeamCollectionsClient.cs
US #68, US#40 Continued
Merge branch 'development' of github.com:fachexot/AMOS-SoftwareForge into development