small fixes
Merge remote-tracking branch 'origin/test' into PA2

Conflicts:
	index.php
Merge remote-tracking branch 'origin/test' into PA2