Upload Commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/views/admin/include/sidebar.view.php