moved sidebar
Merge branch 'development' of https://github.com/aowie1/rocketag_laravel into development

Conflicts:
	application/views/layouts/master.blade.php