references #114
Merge branch 'master' of github.com:m1kc/uonline

Conflicts:
	locparse.php
	locparse_test.php