Merge branch 'merge_develop' of git://github.com/bakercp/openFrameworks into bakercp-merge_develop
Merge branch 'develop-raspberrypi' of github.com:openFrameworks-RaspberryPi/openFrameworks into develop-raspberrypi
makefile clean in examples
Merge branch 'develop-raspberrypi' of github.com:openFrameworks-RaspberryPi/openFrameworks into develop-raspberrypi
Merge branch 'develop-raspberrypi' of github.com:openFrameworks-RaspberryPi/openFrameworks into develop-raspberrypi
Merge branch 'develop-raspberrypi' of github.com:openFrameworks-RaspberryPi/openFrameworks into develop-raspberrypi
Merge branch 'develop-raspberrypi' of github.com:openFrameworks-RaspberryPi/openFrameworks into develop-raspberrypi
Merge branch 'develop-raspberrypi' of github.com:openFrameworks-RaspberryPi/openFrameworks into develop-raspberrypi
moved up mapinfo to allow compilation on RPI
Merge pull request #102 from jvcleave/develop-raspberrypi

moved mapinfo up (was causing error)