[fix] converted some functions to private
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/js/main.js
[merge] with new mobile sidebar additions
Merge remote-tracking branch 'origin/master'