Commit
Merge branch 'master' into Liran

Conflicts:
	app/src/main/java/com/teampay/teampay/MainActivity.java