ui
ui finish
ui finish
Questions page CSS changes
Merge branch 'clientnew' of https://github.com/idofishler/SAP-ALS-hackthon into clientnew

Conflicts:
	ALS_client/src/main/webapp/style/style.css
Fix initial page in app
Merge branch 'master' into clientnew

Conflicts:
	ALS_client/src/main/webapp/style/style.css