CRUD CLientes
Merge branch 'master' of https://github.com/irineul/siaconsul.git

Conflicts:
	app/controllers/Cliente.java
	app/models/ClienteModel.java
	public/stylesheets/main.css
CRUD Usuario/clientes