test

test
Merge branch 'master' of https://github.com/queenyjina/phonegap-genymotion

Conflicts:
	phonegap-genymotion