branche test2
master1
Merge branch 'feature'

Conflicts:
	orehara/src/com/kse/orehara/MainActivity.java
branche test3
Merge branch 'master' into feature
rebase test
rebase test3
rebase test3
Merge commit 'f2870ee73ab151ece07e38ad804ee510714c240e' into feature