temp
Merge branch 'master' of https://github.com/hieutn/voer

Conflicts:
	Voer/src/vn/edu/voer/activity/MainActivity.java