* Final tweaks.
Merge origin/master

Conflicts:
	public_html/js/index.js