Landing page and user sign in 1
Merge remote-tracking branch 'origin/master'

Conflicts:
	web-app/css/layout.css
roey`s change to datepicker