Add navigation drawer to SaomActivity.java
Merge branch 'master' of https://github.com/AppSomeHow/Ramadan
Fix merge errors