Merge branch 'feature/css-javascript-cachebusting' into release/20130702