Clean
Merge branch 'master' of github.com:vcrazy/project-8

Conflicts:
	android/project-8/res/layout/list_item_statistics.xml
	android/project-8/res/values/strings.xml
Merge branch 'master' of github.com:vcrazy/project-8