moving to developer branch
Merge branch 'master' into developer

Conflicts:
	Core/WPISuite/WebContent/WEB-INF/lib/RequirementManager.jar
Merge branch 'developer' into developer-history