Moved js to user.js
Merge branch 'master' of github.com:sebs/medproto

Conflicts:
	prototyp/template.html