- Refactoring layout resources v2.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.classpath
	gen/uni/projecte/R.java
	res/layout/samplesmap.xml