merged
Merge remote-tracking branch 'origin/master'

Conflicts:
	Peek/src/main/java/com/osacky/peek/CameraFragment.java