no message
Merge branch 'master' of https://github.com/petamoriken/positive-agent

Conflicts:
	js/move.js
login2
Merge branch 'master' of https://github.com/petamoriken/positive-agent