add Page object, Media object, working on integrating with bookview
Add page and media loading functionality
Adding Language support
xml language parsing in progress
Fully integrate media object within app
Clean up a bit
More or less done with the Language Model
commenting and cleaning LanguageModel
Merge pull request #3 from ptterb/mediaObject

Media object integrated
Merge pull request #2 from tomarthur/master

keyboard control for development without RFID readers
Merge pull request #4 from tomarthur/master

Tweening Example
Merge branch 'master' of https://github.com/camb416/Poison_2013

Conflicts:
	RFIDBook/RFIDBook.xcodeproj/project.pbxproj
Almost there with the Language Controller
language bugfixes...
further with the language controller
added test images for language tester
Language-specific asset loader working

TODO: get rid of all the couts in LanguageController.cpp
ditched the couts
dummy commit
updated RFIDBook with new Language subsystem.

Bookview needs work