Uncommented borders for view objects and fixed
Merge branch 'master' of https://github.com/jbmorse/Dragonfly

Conflicts:
	EventView.o
	ViewObject.o
	game.exe
	log.txt