bottom toolbar
Merge remote-tracking branch 'origin/master'

Conflicts:
	RitiRiwaj/src/co/ritiriwaj/android/MainActivity.java