Changed api
Merge branch 'profile' of https://github.com/mdiss2012-socialpics/socialpics_webapp into profile