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.