Merge branch 'service' into devise

Conflicts:
	.idea/workspace.xml
add /.idea/ to gitignore
gitignore
git rm -r .idea/
Merge branch 'development' of https://github.com/SIWD/EVERENT into development