Altereções do View Admin
gitignore
Merge branch 'master' of https://github.com/odraude7/ArRails

Conflicts:
	app/assets/javascripts/application-admin.js
	app/assets/stylesheets/application-admin.css
	app/views/administrativo/caracteristica_imovels/index.html.erb
	app/views/administrativo/tags/index.html.erb