Merge origin/master

Conflicts:
	application/views/templates/side_bar.php
Merge origin/master
Merge origin/master

Conflicts:
	application/views/templates/side_bar.php