merge properties
Merge branch 'master' of https://github.com/csaluigm/ADM2013.git

Conflicts:
	project.properties