ya! is weks!
Merge branch 'develop' of https://github.com/guzno/PictureGallery into develop

Conflicts:
	src/se/magnulund/PictureGallery/fragments/GalleryFragment.java