Fix in phantomjs asserts
Minor changes
Merge branch 'fix-phantomjs' into 0.4.1-SNAPSHOT
Fix dependencies and added new test
Fix add return statement if last statement is an ifStatement
Remove @DomainClass