first sync
Merge branch 'master' of github.com:TomTasche/WhistleApp

Conflicts:
	src/at/tomtasche/whistleapp/WhistleProcessor.java