Merge pull request #50 from trilliput/master

issue #45: put some placeholders for data in settings and local_settings
Gitlive on landing.

Web commit from ipad
It was bad idea

Надо куда нить внутрь запихать. И не с планшета
Fixes #49
Merge branch 'master' of github.com:averrin/emergent
websocket with pusher #44
add some css and username #44
#44 some cosmetic
#44 some cosmetic