Made content layouts native Android, refactored other layouts, testing-ready draft.
Merge remote-tracking branch 'origin/master'