update version no for next dev version
fix issue with styles
resource xml
Merge remote-tracking branch 'upstream/master'

Conflicts:
	AndroidManifest.xml