DEEVO Place EXAMPLE GIT DEEEVO =P
Merge branch 'master' of
https://github.com/danbarretodev/DeevoProyecto.git

Conflicts:
	src/com/tis/deevo/java/client/HeaderView.ui.xml
	war/WEB-INF/classes/com/tis/deevo/java/client/HeaderView.ui.xml