change java code source and target to 1.7, now we are using jdk1.7.
resolve rebase issue
resolve rebase issue
Merge pull request #1 from skyao/develop

merge from develop branch