split the java and adroid code for new user
Merge remote-tracking branch 'origin/master'