A
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/controllers/welcome.php
	application/views/welcome_message.php