preparing for merge, nothing new
merged
prepare for merge
mobile detail post view works again
merge detail and map

Merge branch 'server' of https://github.com/katarinakyh/cc7 into server