combined two apps into one, many enhancements
Merge branch 'master' of https://github.com/fivehellions/Android