Merge pull request #41 from tgf/evergreen

[MONDRIAN-2122] NPE ragged hierarchies
[MONDRIAN-1912] implemented containsAggregateFunction to allow cell calcs
to be compatible with SCOPED solve order mode.
Merge branch 'evergreen' of https://github.com/wgorman/mondrian into evergreen
[MONDRIAN-1572] Added the ability to push down compound slicers in certain
scenarios to avoid resolving bridge members relating to many to many
dimensions.
[MONDRIAN-1572] eliminate OR predicates when full crossjoin of columns