shitty shit4
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/ru/chopsquad/ontime/activities/list_adapters/ChooseFriendsAdapter.java