Merge branch 'release/7.x-0.53.3' into develop
Downloading and enabling advanced aggregate
Advanced Aggregation
add cql_parser
Add shortcode module to installation
Merge branch 'feature/1369-advagg' into develop

Conflicts:
	bibdk.install
enable shortcode module
version 7.x-0.54
Merge branch 'release/7.x-0.54'