Remove login-link @id
Fix resolve.js dependencies
Merge branch 'master' of github.com:3-Round-Stones/callimachus into develop
Wait for alter box to be present during tests
Show (likely) login state sooner
Merge branch 'master' of github.com:3-Round-Stones/callimachus into develop

Conflicts:
	webapp/scripts/login.js