update less4j version to 1.2.1
Merge branch '814' into 1.7.x
update webjars version to 0.0.6 and fix the issue
Merge branch 'issue789' into 1.7.x
add explicitly new line at the end of each merged resource to avoid unexpected commented code in javascript resource after merge operation
Merge branch 'issue813' into 1.7.x
fix failing unit tests
Merge branch 'issue813' into 1.7.x
fix failing unit test
Merge branch 'issue813' into 1.7.x
check for resource modifications in asynchronously
add tearDown method in test
Fix failing test
experimental changes regarding running change detection asynchronously. This approach has some problems, because async means no context is available and a lot of logic re requires it
fix failing unit test
Unset the used correlation id after the filter, and restore the original one

Fixes https://code.google.com/p/wro4j/issues/detail?id=824
add unit test proving that the problem is fixed
Merge branch 'issue824' into 1.7.x
reduce visibility of a method which is not required to be overriden by test
Merge branch 'issue824' into 1.7.x