merge some minor changes from database branch
added a lib
unbreak the merge
Update README.md

suggested branching procedure for mocking
branch for RadarDatabase.java development
self_contact is now also handled in SQLite database
Merge branch 'database'

Conflicts:
	README.md