added ompet.java
Merge branch 'nextuserstory' into develop