UI update 4:31PM
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/layout/activity_input_new_item.xml
UI update 9:42PM
Merge remote-tracking branch 'origin/master'