some code refactoring
Merge branch 'feature/study_request_37' into staging
fix resize for main_carousel
Merge branch 'feature/photoalbum_#35' into staging