拍照、裁剪、部分滤镜
拍照
Merge branch 'master' of https://github.com/ITBox/BabySay

Conflicts:
	app/AndroidManifest.xml
	app/res/menu/global.xml
	app/res/values/strings.xml
	app/src/cc/itbox/babysay/fragments/LoginFragment.java
	app/src/cc/itbox/babysay/fragments/MainPageFragment.java
	app/src/cc/itbox/babysay/util/Constants.java
manifest
m
a
up
Merge branch 'master' of https://github.com/ITBox/BabySay

Conflicts:
	app/AndroidManifest.xml