Merge branch 'master' of https://github.com/NnNHackTeam/israkotz

Conflicts:
	IsraKotzApp/collectNumbeoData.py
Merge branch 'master' of https://github.com/NnNHackTeam/israkotz