changes due to errai updates
Merge pull request #48 from EricWittmann/master

Some changes due to errai updates