Merge branch 'issue785' into 1.7.x
wro.properties file location should be configurable for wro4j-runner
Merge branch 'issue787' into 1.7.x
fix merge conflicts
fix failing unit test
Merge branch 'fix' into 1.7.x
Merge branch 'fix' into 2.0.x
update wroConfigurationFile description
fix merge conflicts