add type to tour
Merge pull request #17 from avamel/country_tour

Country tour
before merge
merge commit
add type of holidays and tours to tours
add view teaser
Merge branch 'tours_feature' of https://github.com/xamenrax/panda2.0 into country_tour
add show pages to news and travels
add holiday type in active_admin
add holiday type
Merge branch 'tours_feature' of https://github.com/xamenrax/panda2.0 into country_tour