Merge branch 'master' of github.com:poloniculmov/ember-crm

Conflicts:
	.gitignore