Update: #2
Merge remote-tracking branch 'Arfeanew/master'

Conflicts:
	setup/index.php