moving to developer branch
Merge branch 'master' into developer

Conflicts:
	Core/WPISuite/WebContent/WEB-INF/lib/RequirementManager.jar
Create Iteration Observers and Contollers (WIP)
Merge branch 'developer-updatedelete' of https://github.com/djkirby/wpi-suite-tng into developer-updatedelete