changed login view, version 2
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	view/src/main/java/com/engagepoint/team_a/common/DataTreeNode.java