TODO Statement added
Merged 'dev'.

Conflicts:
	test/e2e/route-registration-form.dalek.js
added login test