Camera works but button is invisible
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	res/layout/add_photo.xml
	src/com/example/blubz/MainScreen.java
CAMERA