commit hardfromdev.java
Merge branch 'dev'