add missing javascript folder
add some files before merge
Merge branch 'codeproject-2'