DataBase
Merge https://github.com/Android-team/project-2

Conflicts:
	README.md