stufffz
Merge branch 'master' of https://github.com/gingerbeard92/GetRekked

Conflicts:
	GetRekked/.classpath

GetRekked/src/edu/scranton/getrekked/server/UserContentManagement/UserCo
ntentServiceImpl.java

GetRekked/war/WEB-INF/classes/edu/scranton/getrekked/client/ReviewManage
ment/ReadReviewPresenter.class

GetRekked/war/WEB-INF/classes/edu/scranton/getrekked/client/ReviewManage
ment/WriteReviewPresenter.class

GetRekked/war/WEB-INF/classes/edu/scranton/getrekked/server/UserContentM
anagement/UserContentServiceImpl.class

GetRekked/war/WEB-INF/classes/edu/scranton/getrekked/shared/MovieDao.cla
ss