Merge branch 'master' of https://github.com/lightalkmst/sgre

* 'master' of https://github.com/lightalkmst/sgre:
  Santa characters and a bugfix
Almost launch EX3, add santa stuff
fix crash in fight/dungeon
Add some admin functions
Improve logging
wtf dude
Bugfixes
Merge branch 'master' of https://github.com/sharpobject/sgre

Conflicts:
	characters.lua