banner
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	src/application/views/home.php