thinp
Merge branch 'master' of https://github.com/nttuyen/vieted

Conflicts:
	AndroidManifest.xml