resolving conflicts
resolving
Merge branch 'master' of github.com:chuckrea/giftr
Merge branch 'master' of github.com:chuckrea/giftr
images working when item uploaded BUT item.url getting set in bad way and causing images to load VERY SLOWLY
images getting loaded when item added but VERY SLOW, need fix
item images loading but very slowly