fixed not in game display bug, added border to event feed
Merge branch 'dev' of github.com:Chandler/flesh into dev