changed array list type of of photos and illus to media objects
finished up media stuff in general controller, working on the tests for it
Merge branch 'master' of https://github.com/CMPUT301F13T13/StoryHoard
changes to general controller (dealing with media)
changed min and target api level to match the storyhoard project