update
Merge branch 'master' of https://github.com/arikfe/236369Project.git

Conflicts:
	src/main/java/com/technion/project/UserSecurityConfig.java
merged