updated files
Merge branch 'master' of https://github.com/tsloncz/web

Conflicts:
	insert.php