Don't know how it got there, but just in case...fix crash

Don't know how it got there, but just in case...
don't comit secret files... :P
Merge branch 'master' of github.com:A-Zak/Streets

Conflicts:
	.gitignore
Merge branch 'master-omri'
db dump for migration
create kubernetes deploy configuration / script
update docker with new deploy stuffs