resources placeholding cs/js/html
Merge remote-tracking branch 'origin/master'
bump