Changing config.
Merge branch 'master' of https://github.com/ceiroa/iHealthMaven

Conflicts:
	src/main/setup/sun-resources.xml