change datastore
ll
kkk
Merge branch 'Liorbs' of https://github.com/aglos/A-Smart-Lecturer into avshalom

Conflicts:
	A-Smart-Lecturer/war/WEB-INF/classes/.gitignore
all admin user pages