Added linear layout for activity_photo
Merge branch 'master' of https://github.com/LincB/PhotoApp

Conflicts:
	res/layout/activity_photo.xml