First commit my branch
Tabelas Responsivas, Imagens imoveis
Images with positions
Sortable 1.0
css sortable
Horizontal OK! Faltando ajustar o tamanho
Upload de Imagens funcional, faltando refinamento.
Organizando o master
Merge branch 'master' of github.com:odraude7/ArRails

Conflicts:
	.gitignore
	config/initializers/devise.rb
OMG, so many conflicts. But vader is back!!!
Merge branch 'master' into modelando_views_admin

Conflicts:
	Gemfile.lock
	app/assets/javascripts/application.js
	app/controllers/administrativo/imovels_controller.rb
	app/models/imovel.rb
	app/views/administrativo/corretors/_form.html.erb
	app/views/administrativo/corretors/index.html.erb
	app/views/administrativo/imovels/_form.html.erb
	app/views/administrativo/imovels/index.html.erb
	app/views/administrativo/imovels/show.html.erb
	app/views/administrativo/mensagems/index.html.erb
	app/views/layouts/corretor.html.erb
	config/initializers/carrierwave.rb
	config/initializers/devise.rb
	config/routes.rb
	db/schema.rb
Eliminação do model 'ImovelTansacao' e elimincao da ligacao entre Estado
e Endereço, pois esta ligação já é feita a partir de cidade
bugBuscaCorretor-Data
Merge branch 'master' of https://github.com/odraude7/ArRails.git
Oh Gooodd, conflito resolvido!!!!!
Merged with master
Merge branch 'modelando_views_admin'

Conflicts:
	app/views/administrativo/imovels/show.html.erb
	db/schema.rb
show
Merge branch 'master' of https://github.com/odraude7/ArRails.git
corretorCadastraImovelInativo
Images Build Commited
Merge branch 'master' of github.com:odraude7/ArRails

Conflicts:
	db/schema.rb