some
Merge remote-tracking branch 'origin/master'

Conflicts:
	views/elements/welcome_screen.php