-
Merge branch 'master' of https://github.com/mariogrip/minepeon-base

Conflicts:
	http/sql/README.txt
	http/sql/index.php