get root_url working
Merge remote-tracking branch 'origin/master'

Conflicts:
	laravel/public/assets/js/cfnav.js