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

Conflicts:
	Funtime-Runtime/src/ca/ualberta/cs/funtime_runtime/AuthorAnswerActivity.java
	Funtime-Runtime/src/ca/ualberta/cs/funtime_runtime/classes/Answer.java