update
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/views/home/forum_view.php
	application/views/home/mythread_view.php