reformatted java code
cleaned entries
merged content-provider with client