fixed bug that causes too many images to be saved
SEP-9 everything working
Merge branch 'social' into dev