branch merge
updated premake files for vs2012 target