files upload is fixed
Merge branch 'master' of https://github.com/KernelCorp/almadeladanza

Conflicts:
	app/assets/stylesheets/active_admin.css.scss