java 7 test
Merge branch 'develop'