Merge pull request #30 from DIdiHL/mia

move fileName to CaptureSetting
Merge
Merge branch 'development' of https://github.com/DIdiHL/plugin_android_library into zhaoyue

Merge
Fix project setting.
Merge branch 'development' of https://github.com/DIdiHL/plugin_android_library into hanlin

Conflicts:
	MockApp/app/app.iml
	PluginAndroidLibrary/plugin_android_library/plugin_android_library.iml
Merge pull request #31 from DIdiHL/hanlin

Fix project settings.
Using the library, all code delted
Merge pull request #32 from DIdiHL/zhaoyue

Zhaoyue
Change API level from 20(4.4W) to 19(4.4)
Merge branch 'development' of https://github.com/DIdiHL/plugin_android_library into hanlin
Merge pull request #33 from DIdiHL/hanlin

Change API level from 20 to 19 to eliminate rendering error
Fixed a bug which results app not working
Merge pull request #34 from DIdiHL/zhaoyue

Fixed a bug which results app not working
Fix polling event bug.
Merge branch 'development' of https://github.com/DIdiHL/plugin_android_library into hanlin
Merge pull request #35 from DIdiHL/hanlin

Hanlin
Fix unit test for event.
Merge branch 'development' of https://github.com/DIdiHL/plugin_android_library into hanlin
Add listener tests. Pass all tests.
Rename the test case.