commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/controllers/home.php
	application/views/rufin/header.php
	application/views/rufin/sidebar.php
commit