Merge branch 'master' of https://github.com/DKholevinsky/Bizlida

Conflicts:
	.gitignore