ResourceService
Merge branch 'master' of https://github.com/CRSP/CRSP
2014
Merge branch 'master' of https://github.com/CRSP/CRSP

Conflicts:
	src/com/crsp/controller/ResourceController.java