Added cardinality aggregator to elastic, also fixed page count
added a new string type that always matches a valid encoded base64 string
added a more generic lock
made the code compile.. solved a circular dependency and removed some erroneous package names
reverted some things. moved the KeyLock to gaecontext. added a new error type to make it simpler to include stack traces in errors.
Merge remote-tracking branch 'origin/master' into feature/enterprise_activate_sound_zone