1
Merge branch 'gpp' of https://github.com/groverz/droidapad into gpp

Conflicts:
	db/db.sqlite3