change for dropbox storage carrier wave
add devise for rails 4
config rails_admin authentication for users
ignore
shit
Merge branch 'new'
Merge branch 'master' of https://github.com/joaovitoras/kiira-onew

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
	config/initializers/devise.rb
	config/initializers/rails_admin.rb
	config/locales/devise.en.yml
	config/routes.rb
	db/development.sqlite3
	db/schema.rb