add new changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	Reactr/src/main/java/com/example/reactr/fragments/CreatePhotoFragment.java
	Reactr/src/main/java/com/example/reactr/reactr/models/CameraSurfaceView.java