Merge branch 'master' of https://github.com/jamiehutber/sdapp

Conflicts:
	www/icon.png
	www/res/icon/android/icon-36-ldpi.png
	www/res/icon/android/icon-48-mdpi.png
	www/res/icon/android/icon-72-hdpi.png
	www/res/icon/android/icon-96-xhdpi.png
	www/res/icon/android/icon.png