Fish Random Number

finished Waffle ticket #1
Merge remote-tracking branch 'origin/Fish'
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/com/example/android/softkeyboard/Bot.java