Merge pull request #18 from jvelasques/master

[CDE-161] Error including Saiku Query
[CDF-238] - Review build process for CDE master
[CDF-238] - Version.xml still had TRUNK hardcoded
Merge pull request #19 from pamval/master

[CDF-238] - Review build process