Commit.
Merge branch 'master' of https://github.com/s7droid/Menu.git

Conflicts:
	MenuProject/bin/AndroidManifest.xml
	MenuProject/bin/R.txt
	appcompat_v7/bin/android-support-v7-appcompat.jar
Merge branch 'master' of https://github.com/s7droid/Menu.git
Merge branch 'master' of https://github.com/s7droid/Menu.git
Meal ordering activity
Custom element in meal order activity
Layout updates