stuff
Merge branch 'master' of github.com:yuttadhammo/meditation-plus-server

Conflicts:
	chatv
	listv
	loggedin