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
fix merge conflicts