Fix quality issues
Fix quality issues
Merge branch 'dev' into dev-quality

Conflicts:
	PlanningPoker/src/edu/wpi/cs/wpisuitetcw/modules/planningpoker/controllers/ImportRequirementController.java
	PlanningPoker/src/edu/wpi/cs/wpisuitetcw/modules/planningpoker/controllers/req/RetrievePlanningPokerRequirementsForSessionController.java
Merge pull request #98 from Team-Combat-Wombat/dev-quality

Dev quality