Options menu added. Fix for TabBar impovements
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/lbbw/AggiesLand/aggiesland/app/TabBarActivity.java
	build/intermediates/model_data.bin