commit before merge
Merge branch 'development' of https://github.com/eidola/eidola into development

Conflicts:
	config/database.yml
Soundcloud player added and small fixes