Database dump.
Merge branch 'master' of github.com:Fishgate/isa_micro

Conflicts:
	htdocs/index.php
Merge branch 'master' of github.com:Fishgate/isa_micro