Converted to drawer-based skeleton and re-factored app structure
Merge remote-tracking branch 'origin/master'