commit recent changes
Merge branch 'master' of https://github.com/yanivca/WebTechnologies

Conflicts:
	api/users.js
	public/js/mobile/BitCoinMeetup.js
Merge branch 'master' of https://github.com/yanivca/WebTechnologies

Conflicts:
	api/users.js
	public/js/mobile/BitCoinMeetup.js