slide
adaptado sidebar
delete files
delete
admin.js.coffee
Merge remote-tracking branch 'origin/frontend_admin' into frontend_admin

Conflicts:
	app/assets/javascripts/admin/admin.js.coffee
cambios 1
agregado el layout de login y locale devise.es
delete file
Merge branches 'master' and 'frontend_admin'
cambios 15/08/2014
estandarizando vistas de modulos
delete
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/users_controller.rb
	app/views/layouts/admin/_sidebar_links.html.haml
	app/views/users/index.html.haml
	config/locales/es.yml
ultimos cambios
adaptando contact_us
adaptacion a sitebar
standar
deleted
adaptacion de angular