a few updates
did some work on image controller
Merge remote-tracking branch 'origin/apr12_imagecontroller' into apr13_matt
image gallery integration work
various updates