Added EditMode activity
edited laytout for edit_mode_activity
Merge branch 'master' of https://github.com/CMPUT301F13T13/StoryHoard into KimWork
Merge branch 'master' of https://github.com/CMPUT301F13T13/StoryHoard
Merge branch 'master' of https://github.com/CMPUT301F13T13/StoryHoard
Merge branch 'master' of https://github.com/CMPUT301F13T13/StoryHoard into KimWork
renamed unused classes with an underscore
Merge branch 'master' of https://github.com/CMPUT301F13T13/StoryHoard into KimWork
Merge branch 'KimWork'