commit
Merge branch 'develop' of https://github.com/OliveMedia/visitor-induction into develop

Conflicts:
	webapp/application/controllers/welcome.php