Started upload implementation
Merge branch 'master' of http://github.com/zaez-official/joker-rails

Conflicts:
	config/locales/br.yml
	config/locales/en.yml
	vendor/assets/javascripts/joker/Form.coffee