commit from office
Merge remote-tracking branch 'origin/master'

Conflicts:
	dao/db.php
	index.php