Merge branch 'yals'

app/src/main/AndroidManifest.xml

...om/peruse/saran/amritaod/actionareas/applyodActivity.java

...ava/com/peruse/saran/amritaod/actionareas/od_display.java

...m/peruse/saran/amritaod/actionareas/userAreaActivity.java

...m/peruse/saran/amritaod/approvedrecycler/CardAdapter.java

...saran/amritaod/odhistory/history_CustomVolleyRequest.java

...se/saran/amritaod/odhistory/history_approvedActivity.java

.../peruse/saran/amritaod/odhistory/history_cardadapter.java

app/src/main/res/layout/activity_history_odapprove.xml

app/src/main/res/layout/activity_od_approve.xml

app/src/main/res/layout/odapprovedlist.xml

app/src/main/res/layout/odlist.xml