code restructure
Changes to enahnce performance of image upload and crop for broadcasts
code cleanup
merge with master