asdfg
Merge branch 'master' of https://github.com/curediary/curediary

Conflicts:
	res/layout/adapter_name_pills.xml
	src/com/cure/diary/report/adapters/AdapterReport.java