Merge branch 'master' of https://github.com/joaovitoras/kiira-onew

Conflicts:
	config/environments/development.rb