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 pull request #80 from DIdiHL/mia

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

Zhaoyue
add launch snorelab in mocksana
Merge pull request #82 from DIdiHL/chenxi

add launch snorelab in mocksana
Now using the library
Merge pull request #83 from DIdiHL/zhaoyue

Now using the library
add recieve intent
Merge branch 'development' of https://github.com/DIdiHL/plugin_android_library into chenxi
Merge pull request #84 from DIdiHL/chenxi

Chenxi
UI is working, now lunch.
Merge pull request #85 from DIdiHL/zhaoyue

UI is working, now lunch.
small changes
rewrite mockapp using library