Changes to solve VS2013 / Boost 1.55 issue
Moved unecessary include to cpp
Merge branch 'dev' of https://github.com/MerickOWA/Cinder.git into rexgo