swimline implementation
Merge branch 'master' of https://github.com/mfthepop/tourismik.git

Conflicts:
	store/app/views/tours/index.html.erb