Added requirements and admin controller
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/models/requirements/Requirement.java
Merge remote-tracking branch 'origin/master'