restore dev version after 1.2
Merge branch 'branch-1-2'

Conflicts:
	CMakeLists.txt
add PNG "none" compression mode for disabling png zlib compression
Fixing issue in REST-style URL parsing that prohibited usage of timedimensions.
Allowing a double hyphen as a separator for time intervals as specified in a note in clause 4.4.2 in ISO8601.
Fixing wrong parsing of time intervals separated with '--'.
Merge branch 'rest-timedim' into auth