Merge branch 'hotfix/improve-maps'
setup travis-ci
Coupon.validates :shop, presence: true
Post.validates :shop, presence: true
Merge branch 'hotfix/validate-presence-of-shop' into develop

Conflicts:
	.travis.yml