git modules
Merge branch 'master' of github.com:geekylab/GeekyMenu

Conflicts:
	.gitmodules
	GeekyMenuCloudApp