ggj
Merge branch 'master' of https://github.com/frgossen/AndroidReceiver.git

Conflicts:
	AndroidReceiver/src/de/ichede/androidreceiver/swing/Canvas.java
Merge branch 'master' of https://github.com/frgossen/AndroidReceiver.git