Template 6
Merge branch 'master' of https://github.com/estnw/estnw

Conflicts:
	lib/android/example/assets/www/index.html