Merge branch 'Latuxov'

Conflicts:
	Reactr/src/main/java/com/example/reactr/fragments/AddMessageFragment.java
Merge remote-tracking branch 'origin/master'