mordy 555
Merge branch 'master' of https://github.com/poktz/poktz

Conflicts:
	app/views/static/ekoloko.html.erb
mordy 6
Merge branch 'master' of https://github.com/poktz/poktz

Conflicts:
	config/initializers/globals.rb
	config/routes.rb