添加了几个滤镜的包
Merge remote-tracking branch 'origin/master'

Conflicts:
	MeiTuCamera/bin/MeiTuCamera.apk
	MeiTuCamera/bin/classes/com/sgb/meitucamera/CameraPreview.class
	MeiTuCamera/bin/classes/com/sgb/meitucamera/R$drawable.class
	MeiTuCamera/bin/classes/com/sgb/meitucamera/R$id.class
	MeiTuCamera/bin/classes/com/sgb/meitucamera/R$layout.class
	MeiTuCamera/bin/classes/com/sgb/meitucamera/R$menu.class
	MeiTuCamera/bin/classes/com/sgb/meitucamera/R$string.class
	MeiTuCamera/bin/classes/com/sgb/meitucamera/R$style.class
	MeiTuCamera/bin/resources.ap_
	MeiTuCamera/gen/com/sgb/meitucamera/R.java
	合并分支
合并分支