Merge branch 'javascript_namespacing' into 211_javascript_namespacing

Conflicts:
	includes/js/functions.js
	index.php