fix #2937: Merging of personal note not OK
fix #2963: Cache count on main screen shows 0
refactoring: make calendar build with Ant
refactoring: minor cleanup, experimenting with Checkstyle
Implements #750, use preference activity
Dynamically bind preferences summary
Move preference keys to resource
Remove SettingsActivity WIP