gffff
Merge branch 'master' of https://github.com/yuanwenfei/Hdroid.git

Conflicts:
	project.properties