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

Conflicts:
	PluginAndroidLibrary/plugin_android_library/plugin_android_library.iml
Integrate heartbeat with real sana
Merge branch 'development' of https://github.com/DIdiHL/plugin_android_library into zhaoyue

Conflicts:
	PluginAndroidLibrary/plugin_android_library/plugin_android_library.iml
Merge pull request #110 from DIdiHL/zhaoyue

Zhaoyue