Check for new db and update
Merge branch 'master' of github.com:vcrazy/project-8

Conflicts:
	android/project-8/res/layout/tab_navigation.xml
	android/project-8/src/com/example/project_8/MainActivity.java