Merge branch 'develop' of https://github.com/openframeworks/openFrameworks into develop
update osx scripts to work with 071 folder structure, and mimic the linux scripts
fix formatting of osx scripts
Merge branch 'develop' of https://github.com/openframeworks/openFrameworks into fix-osxScripts
update osx scripts to use new makefile
make osx scripts more like the linux scripts
fix formatting of osx scripts
use xcode on osx scripts
optimised texture loading for ofxAssimpModelLoader.
previously a texture was loaded for every mesh without checking if the texture already existed.
this approach saves on any unnecessary texture loading.
textures now holds a vector of ofxAssimpTexture, this fixes a small bug that crept in.
fix vs2012 quirk

avoiding a harmless inheritance by dominance warning message
rename vs2012 template files

renames template files to reflect visual studio 2012
rename vs 2010 - > 2012 (purely aesthetic)
fix projectGenerator project file

* The project generator project file was originally *not* properly
linked against MultiThreadedDebugDLL, which lead to extreamly misleading
crashes when closing derived fstream and istream classes, because
debugging is more interesting that way...

it has something to do with how the compiled libraries are laid out, I
came to believe.

<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

was the big game changer.

* also adds missing GUI elements for ofxGUI in project Generator Project
file.
include missing ofxGui files in project generator project file
fix names for vs2012 project generator template
Merge branch 'develop' of github.com:roymacdonald/openFrameworks into develop
Merge branch 'develop' of git://github.com/openframeworks/openFrameworks into develop
Merge branch 'develop' of git://github.com/openframeworks/openFrameworks into develop
Clean up VS2012 project