Merge branch 'develop' of https://github.com/powerbot15/PhotoeGallery into develop
little optimized