Merge origin/master

Conflicts:
	application/views/archive/search/profile_view.php
Merge origin/master
Merge origin/master

Conflicts:
	application/views/archive/search/profile_view.php
Merge origin/master