with temporary password login functionality
Merge branch 'master' of https://github.com/depuginde4119/nswebsite

Conflicts:
	.classpath