fixed all the mess ups
fixed merge issues
Merge pull request #60 from cenderin/master

fixed alot of our issues with views, got picture showing before upload on art photos
mereg conflicts