preliminary design finished
Merge remote-tracking branch 'javaprojects/master'
preliminary design finished