test
Merge remote-tracking branch 'origin/master'
add dynamic web project plugin
add java plugin