Cleanup of main classes and xml
Merge branch 'master' of https://github.com/jinopark/androidExpo