change changeee
change
Merge branch 'master' of https://github.com/liangjiajiang/Hackathon2014.git

Conflicts:
	circle_project/bin/circle_project.apk
	circle_project/bin/classes.dex
	circle_project/bin/resources.ap_
	circle_project/src/com/example/circle_project/MainActivity.java