Refactoring to fully remove changeset cache from main.
Merge remote-tracking branch 'origin/master' into changeset_cache_refactor
Merge commit '5f7471dc4f3b3e6c7855bee185be5428bea84f5f' into gsoc13

Conflicts:
	src/main.cpp
Merge branch 'gsoc13' of github.com:pnorman/openstreetmap-cgimap into gsoc13