Merged unnecessary stdafx.h with stdafx.hpp.
Merge pull request #226 from murrekatt/develop

Merged unnecessary stdafx.h with stdafx.hpp.