Migrated to 2013 Visual Studio.
Merge branch 'develop'