Merge pull request #3 from narc88/master

Login y cambios vistas maru
Merge pull request #2 from bengui/pre-production

Pre production
Update User after login
Promoters registration working
Merge branch 'pre-production'
Initializers para currency franchisor y franchises.
Cargue argentina mexico y puerto rico, y franuquicias parana rosario santa fe y buenos aires, tambien la moneda peso argentino para probar y un valor, 7.8
Merge remote-tracking branch 'upstream/pre-production' into pre-production
Initializer for countries (falta hacer, todavia)
Merge remote-tracking branch 'upstream/pre-production'
Cambios css home head
Promoters list sons
Adds Deals and Stores, User edit view
Sorry, now it's compiling
Adds stores view and refactor Deals controller
Merge branch 'pre-production'
Incializacion de paises y estado
Merge remote-tracking branch 'upstream/pre-production' into pre-production

Conflicts:
	routes/index.js
routses
Adds deals home and changes to the deals create flow
User Roles