Merge
Merge branch 'development' of https://github.com/DIdiHL/plugin_android_library into zhaoyue

Conflicts:
	PluginAndroidLibrary/plugin_android_library/src/main/java/com/sana/android/plugin/hardware/CaptureSetting.java

Merge
Merge branch 'development' of https://github.com/DIdiHL/plugin_android_library into zhaoyue

Merge
Merge
Merge branch 'development' of https://github.com/DIdiHL/plugin_android_library into zhaoyue

Merge
Merge
Merge branch 'development' of https://github.com/DIdiHL/plugin_android_library into zhaoyue

Merge
Merge
Merge branch 'development' of https://github.com/DIdiHL/plugin_android_library into zhaoyue

Merge
Merge
This is the crazies pull I have ever made
Merge pull request #29 from DIdiHL/zhaoyue

Zhaoyue