Merge branch 'master' of github.com:gsamokovarov/web-console

Conflicts:
	Gemfile.lock
	README.markdown
	lib/web_console/engine.rb