events on games page, etc
Merge branch 'dev' of github.com:Chandler/flesh into dev
added cancel on settings pages, minor tweaks