Merge branch 'release/V1.0'
hotfix commit
Merge branch 'hotfix/V1.0.1'
Merge branch 'hotfix/V1.0.1' into develop
Hotfix1
Merge branch 'hotfix/V1.0.2' into develop
Merge branch 'develop' into feature/TestFeatures

Conflicts:
	WebviewTest/src/com/example/webviewtest/MainActivity.java