Merge pull request #148 from robotmay/master

Hotfixes which fix Recommended section slowness
Working image rotation on upload
Fix specs
Merge pull request #152 from robotmay/rotation-fix

Fix for image rotation.
Merge remote-tracking branch 'upstream/master'