Merge pull request #52 from klindenbach/50-ESHandler

50 es handler
Update Requirements doc so that language aligns with that of Glossary. As well, added UML Use Case diagram.
Commit
Fixed conflicst
Merge pull request #57 from KarlParkinson/master

Update Requirements doc so that language aligns with that of Glossary.
started coding ViewPagesActivity.java
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project
Added proper terms to pdf storyboard
Deleted old pdf
Added Main Menu XML

TODO: Name bar at the top needs to be changed.
Merge pull request #58 from tbendubois/master

New PDF with updated terms. Main menu XML
Merging James Cadek's pull request
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project

Conflicts:
	UIMockup/Storyboard/Storyboard.pdf
	UIMockup/TDubois Storyboard using JCadek UIMockup.pdf
	UIMockup/TDuboisJCadek_Storyboard.pdf
	res/values/strings.xml
fixed merge stuff in Comment.java
removed duplicate main_menu.xml
Fixed XML layouts. Added missing gen directory that was causing problems
Merge pull request #61 from klindenbach/master

Fixed XML layouts. Added missing gen directory that was causing problems
commented out references to nonexistent MyApplication...?
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project
Merge pull request #63 from klindenbach/50-ESHandler

50 es handler