Merge branch 'issue692' into 1.6.x
update to junit 4.11
Update wro.xml in demo to check if there is any issues when referring a resource with spaces in its path. Seems to work ok.
Merge branch 'issue683' into 2.0.x