Merge branch 'master' of https://github.com/divyesh/OHIPSwipe

Conflicts:
app/src/main/java/com/mindblots/ohipswipe/ohipActivity.java
Odd2