update
update
update
update
update
update
update
Merge branch 'master' of https://github.com/ITBox/BabySay

Conflicts:
	app/bin/R.txt
	app/bin/classes/cc/itbox/babysay/ui/FloatLabel.class
	app/gen/android/support/v7/appcompat/R.java
	app/gen/cc/itbox/babysay/R.java
	app/project.properties
	libs/android-support-v7-appcompat/bin/android-support-v7-appcompat.jar
update
update