More puff.
Merge branch 'master' of github.com:radustoenescu/benelaus

Conflicts:
	AndroidManifest.xml
	assets/index.html
	res/drawable-hdpi/ic_launcher.png
	res/drawable-mdpi/ic_launcher.png
	res/drawable-xhdpi/ic_launcher.png
	res/values/strings.xml