First step UTAD iMac
index-teste
index-teste
Merge branch 'master' of
https://github.com/joaoagostinhopavao/Palmir.git

Conflicts:
	Palmir/grails-app/views/index.gsp