removed authors, added contibutors
Merge branch 'dev' into dev-addedCopyrights

Conflicts:
	PlanningPoker/src/edu/wpi/cs/wpisuitetcw/modules/planningpoker/models/PlanningPokerSession.java
	PlanningPoker/src/edu/wpi/cs/wpisuitetcw/modules/planningpoker/view/overviews/ViewSessionTableModel.java
	PlanningPoker/src/edu/wpi/cs/wpisuitetcw/modules/planningpoker/view/overviews/viewSessionComp/ViewSessionReqPanel.java
Merge branch 'dev' into dev-addedCopyrights

Conflicts:
	PlanningPoker/src/edu/wpi/cs/wpisuitetcw/modules/planningpoker/controllers/GenericPUTRequestObserver.java
	PlanningPoker/src/edu/wpi/cs/wpisuitetcw/modules/planningpoker/controllers/GetUnimportedRequirementsRequestObserver.java
	PlanningPoker/src/edu/wpi/cs/wpisuitetcw/modules/planningpoker/controllers/RetrieveAllPlanningPokerVoteController.java
	PlanningPoker/src/edu/wpi/cs/wpisuitetcw/modules/planningpoker/controllers/RetrieveAllPlanningPokerVoteRequestObserver.java
	PlanningPoker/src/edu/wpi/cs/wpisuitetcw/modules/planningpoker/controllers/RetrievePlanningPokerVoteController.java
	PlanningPoker/src/edu/wpi/cs/wpisuitetcw/modules/planningpoker/models/PlanningPokerRequirement.java
	PlanningPoker/src/edu/wpi/cs/wpisuitetcw/modules/planningpoker/view/ToolbarView.java
	PlanningPoker/src/edu/wpi/cs/wpisuitetcw/modules/planningpoker/view/overviews/ViewSessionTableModel.java
Merge remote-tracking branch 'origin/dev' into dev-addedCopyrights
Merge pull request #51 from Team-Combat-Wombat/dev-addedCopyrights

removed authors, added contibutors
Revert "Merge fixes"

This reverts commit 272097483051d58071d65ecbf336f9d041e85cbf.