mademorecompatible with phonegap
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/index2.html
fixedindex2bug