Update UML
Merge branch 'master' of https://github.com/CMPUT301F14T02/TheBrogrammers
Added Javadocs Up until CacheData Manager
Merge branch 'master' of https://github.com/CMPUT301F14T02/TheBrogrammers

Conflicts:
	Agora/src/com/brogrammers/agora/Answer.java
	Agora/src/com/brogrammers/agora/AnswerActivity.java
	Agora/src/com/brogrammers/agora/Author.java
	Agora/src/com/brogrammers/agora/AuthorAnswerActivity.java
	Agora/src/com/brogrammers/agora/AuthorQuestionActivity.java