Create DemoActivity.java and DemoActivityTest.java
Merge branch 'Marco'
Add CategoryAdapter.java