Windows Port

Porting codebase to Visual Studio 2013
Merge remote-tracking branch 'origin/master'

Conflicts:
	CMakeLists.txt