merge with fix photo stream
Merge branch 'master' of https://github.com/kiracp/CatPix
updated button layout
Merge branch 'master' of https://github.com/kiracp/CatPix

Conflicts:
	app/src/main/java/com/kiraprentice/catpix/PhotoStreamActivity.java