Updata doc/database.xls
Updata the database structure file
Merge remote-tracking branch 'origin/document' into arylo

Conflicts:
	web/index.php