got 1.2 to build with mac again
added forgoten files
Merge remote-tracking branch 'origin' into add_back_1.2

Conflicts:
	superbuild/versions.cmake
got things to build in linux
Merge pull request #63 from judajake/add_back_1.2

Add back 1.2