C
Merge remote-tracking branch 'origin/master'

Conflicts:
	LaRockola/project.properties