Merging.
Merge branch 'master' of https://github.com/CMPUT301F14T04/Funtime-Runtime-Project

Conflicts:
	Funtime-Runtime/res/values/strings.xml
Changed some XML formatting, added a button to bookmark questions for later