Upgrade to phgonegap 2.4
Merge branch 'master' of github.com:hackingparty/pocketmusik

Conflicts:
	client/res/xml/config.xml