some progress
db export
Merge branch 'zack' into development

Conflicts:
	lib/MysqlAdapter.php