Manejo del estado del comercio por el Admin
Merge branch 'master' of https://github.com/santiagopiria/Sultanapp

Conflicts:
	app/controllers/Application.java
	app/views/buscar.scala.html