database.yml gitignore.
Merge branch 'navigation_1.2'

Conflicts:
	.gitignore