readme
ok
Merge commit 'e162b1e'

Conflicts:
	actionbarsherlock/bin/actionbarsherlock.jar
Merge branch 'master' of github.com:hyrtyp/CeiReport

Conflicts:
	README