update
Merge branch 'master' of https://github.com/smartfeeling/desktopgap

Conflicts:
	java/.idea/workspace.xml