Create a page with a form, new dump
Merge remote-tracking branch 'origin/master'

Conflicts:
	inc/class/database.php
	index.php