Added platform
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin_debug/dragonfly.log