Inserted templates for register and login
Merge branch 'login-register' into browserify

Conflicts:
	static/timespace.manifest