Merge branch 'issue633' into 1.6.x
add a couple of new tests for WroModel class
when building model from xml, an empty model (with no groups) should be considered valid
fix merge conflicts