Merge branch 'master' into HEAD

Conflicts:
	public/javascripts/views/content.js
	public/javascripts/views/content/login.js
	public/javascripts/views/content/resume.js
	public/javascripts/views/header.js
	public/javascripts/views/header/menu.js
	public/javascripts/views/navigator.js
	public/javascripts/views/navigator/account.js
	public/javascripts/views/page.js
develop commitdevelop commit