Merge branch 'master' of heroku.com:mebel

Conflicts:
	app/assets/javascripts/index.js.coffee