imode
Merge branch 'origin/master'
playble
Merge branch 'my'

Conflicts:
	NumbersGame/src/com/android/grsu/numbersgame/modes/IMode.java