Merge branch 'hotfix/hotfix0.1' into develop
feature_1 end
feature_2 end
Update App.java
Merge branch 'develop' of https://github.com/merphonos/study into develop

Conflicts:
	HelloGit/src/main/java/Hello/HelloGit/App.java
Update App.java
Update App.java
feature_3 commit
Merge branch 'develop' of https://github.com/merphonos/study into feature/feature_3

Conflicts:
	HelloGit/src/main/java/Hello/HelloGit/App.java
Merge branch 'feature/feature_3' into develop
release fix
Merge branch 'release/release-0.1'