Implemented [US#57] and [US#58]
Merge branch 'development' of https://github.com/fachexot/AMOS-SoftwareForge into development

Conflicts:
	SoftwareForge.Mvc/SoftwareForge.Mvc/SoftwareForge.Mvc.csproj