Merge pull request #48 from sieverssj/master

Upgrading to Shindig 2.5.0 from Shindig 2.5.0-beta6.