work in progress - before merging with current master
Merge branch 'master' into timing

Conflicts:
	diagnose/res/values/strings.xml
	diagnose/src/at/tugraz/ist/wv/diagnose/MainActivity.java
deleted files which remained after merge
set up fragment interaction for chooseTimeGameActivity
timegame code complete