Merge origin/master

Conflicts:
	application/views/welcome.php