Merge branch 'develop'
added fog to image_uploader
fixed uploader
ooos
testing fog upload
wtf
pulling from develop