Modiefied Login Page and New Welcome page
Merge remote-tracking branch 'origin/loginpage' into develop

Conflicts:
	src/html/login/login.html