add month_country
fixing conflict
add month_country field
fixing merge
add news to active_admin
Merge branch 'tours_feature' of https://github.com/xamenrax/panda2.0 into country_tour
Merge pull request #17 from avamel/country_tour

Country tour