- Fixed some Xcode 4.6 warnings
- Added EX2Language for doing on the fly language changes
Fixed merge errors