2
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/ru/chopsquad/ontime/activities/MeetingActivity.java
2