merging
merge
Merge branch 'server' of https://github.com/katarinakyh/cc7 into server
post working with Palle, to be tested with geotag now