add
Merge branch 'master' of github.com:antme/pms

Conflicts:
	web/local-data.html
	web/userman.html