Revert "Revert "increment masterBranch""

This reverts commit 7a94081df518191b7045eda5809ca7d2b740b45e.
Merge commit '0fa460fe5c7e6475ecf7f31821dd6c2391f3a9fa'

Conflicts:
	GitTest/src/com/example/gittest/MainActivity.java
Merge remote-tracking branch 'origin/master'