Rename project to jotify
and other things android studio decided to change?
Merge remote-tracking branch 'origin/master'

Conflicts:
	build/intermediates/model_data.bin