Merge pull request #95 from Konviser/master

resize and convert image to png before uploading to database
merge infinite scroll branch with a master one