Ideas gallery functioanlity and couple bug fixes
Merge branch 'dev-branch-kris'