production
Merge branch 'master' of https://github.com/kaxi1993/translate

Conflicts:
	app.js
	package.json
	public/stylesheets/style.css
	views/index.jade
	views/layout.jade