context menu for adding scoring
Merge branch 'master' of github.com:nodnarb/conservo

Conflicts:
	android-client/AndroidManifest.xml
start of quiz