branch merge
updated premake files for vs2012 support
Merge remote-tracking branch 'doug/master'