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

Conflicts:
	MenuProject/bin/R.txt
Strings and gitignore file
Commit.
Commiting resources.
Commit
Merge branch 'master' of https://github.com/s7droid/Menu.git

Conflicts:
	MenuProject/bin/R.txt
	appcompat_v7/bin/android-support-v7-appcompat.jar