Merge branch 'master' of https://github.com/dakaraic/Ignite

# Conflicts:
#	Source/Client/Client.vcxproj
#	Source/Client/Client.vcxproj.filters
#	Source/Client/FolderType.h
#	Source/Client/MainApp.cpp
#	Source/Client/MainApp.h
#	Source/Client/stdafx.h