dz
Merge branch 'master' of https://github.com/garagepoort/Android

Conflicts:
	AlarmsServerApplication/nbproject/private/private.xml