home commit
home commit
home commit
Merge branch 'master' into en-version

Conflicts:
	app.js
	public/javascripts/views/resume/menutemplate.js
	public/templates/landing.html
	public/templates/login.html
	public/templates/register.html