.
Merge branch 'develop' of github.com:LYK-Ruby-On-Rails/les-etoiles into develop

Conflicts:
	.idea/workspace.xml
.