Changes to classes so they match glossary. Also removed EditPageActivity.java
Merge pull request #51 from moorej12/master

Changes to classes so they match glossary. Also removed EditPageActivity
#50 ES handler for save/restore pages w/ tests
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project into 50-ESHandler

Mostly changing Segment to Tile. Forgot about that... hope the UML
didn't get too messed up

Conflicts:
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/AudioTile.java
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/Comment.java
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/Handler.java
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/Page.java
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/PhotoTile.java
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/Reader.java
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/VideoSegment.java
uml diagram created
Merge pull request #53 from moorej12/master

uml diagram created
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project into 50-ESHandler

Conflicts:
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/Page.java
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