[FEATURE] Small changes
Merge branch 'master' of https://github.com/castiron/melange

Conflicts:
	config/application.rb