1. Added _MSC_VER == 1800 to auto_link.hpp for vc120 support
2. Added BOOST_TEST_MESSAGE support to test-suite\utilities.hpp
3. Fixed project files again
4. Fixed a few conflicts in the last merge.