Trying to deploy on heroku
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	FileSenderProject-grailsPlugins.iml
	FileSenderProject.iml
	application.properties
#13. Added download and delete actions in dormitory
#12. "DormitoryService.groovy" : create java part of Dormitory