localDB
Merge branch 'develop' of https://github.com/sonyagen/SocialCampus into develop

Conflicts:
	project/src/il/ac/technion/logic/DBManager.java