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 pull request #19 from DIdiHL/new_skeleton

Add getUri to CommManager
Merge
Merge pull request #20 from DIdiHL/zhaoyue

Added test bluetooth connectivity before each activity
Refactor the mockapp code
Merge branch 'development' of https://github.com/DIdiHL/plugin_android_library into zhaoyue

"Refactor the Mockapp code"
Merge pull request #21 from DIdiHL/zhaoyue

Refactor
added a base class for audio recording, modified CaptureSetting
Merge pull request #22 from DIdiHL/mia

added a base class for audio recording, modified CaptureSetting
implemented DeviceFactory and CommManager and modified the way we use intent between the two mock apps
Merge branch 'development' of https://github.com/DIdiHL/plugin_android_library into chenxi

Conflicts:
	PluginAndroidLibrary/plugin_android_library/src/main/java/com/sana/android/plugin/hardware/CaptureSetting.java
Merge pull request #23 from DIdiHL/chenxi

Chenxi
Add tests for event and listener.
Merge branch 'development' of https://github.com/DIdiHL/plugin_android_library into new_skeleton