Merge remote-tracking branch 'origin/development'
Merge remote-tracking branch 'origin/development'
fixing local settings
fixing debug stuff
adding log dir
gevent thread fix
adding hack fix
setting default debug to true and adding hosts
Merge remote-tracking branch 'origin/master' into development