lol
Merge remote-tracking branch 'origin/master'

Conflicts:
	content/slider_manager/slider_manager.php
	js/admin.js