update for msvc 2012
Merge branch 'develop' of github.com:AndySomogyi/roadrunner into develop
Merge branch 'develop' into more_on_distro

Conflicts:
	source/llvm/ModelGeneratorContext.cpp