добавил ст справ "типы адресов"
Merge branch 'master' of https://github.com/dragothefiery/best_gruz

Conflicts:
	app/assets/javascripts/services/models/base_factory.js.coffee