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

Conflicts:
	PluginAndroidLibrary/plugin_android_library/plugin_android_library.iml

Merge
Merge
UI modified first version
Merge pull request #81 from DIdiHL/zhaoyue

Zhaoyue