Merge
Merge branch 'master' of https://github.com/santiagopiria/Sultanapp

Conflicts:
	public/stylesheets/shop_main.css