no message
Merge branch 'master' of https://github.com/NotWoods/heleon-phonegap

Conflicts:
	icon/128.png
	style.css
no message