Commit to branch_2
Merge branch 'branch_2'

Conflicts:
	src/org/my/github/GithubUtil.java