Update the ImageAdapter to use Picasso and keep the edit view from
crashing
Merge branch 'master' of
ssh://git@github.com/lwen2027/ClothesMatcher.git

Conflicts:
	Prototype/src/rice/clothesmatchingapplication/ImageAdapter.java