fix
ok
fix
Merge branch 'version1' of https://github.com/juffin/Hippo into version1

Conflicts:
	app/src/main/java/as/hippocrates/Main.java
	app/src/main/res/layout/fragment_item_list.xml
	app/src/main/res/layout/item.xml
	app/src/main/res/layout/main.xml