Fixed comments partially
Merge branch 'stickyricelove2_dev' of https://github.com/tmad4000/Outlinr-PHP into stickyricelove2_dev

Conflicts:
	public_html/js/client_admin.js