[Fix] "Duplicate layout files have been detected across more than one
Android package" error
Merge remote-tracking branch 'parent/1.5.0-Dev' into MERGING-1

Conflicts:
	alfresco-mobile-android/project.properties
Merge pull request #217 from jmpascal/MERGING-1

Fix maven issue