Applied windows build fixes from 46df635
Fix bug in commit 87dcd32
Merge branch 'develop' of https://github.com/Meisaka/trillek-common into develop

Conflicts:
	include/bitmap.hpp