Active admin
conflict fixing
fixing admin tour
add currency
Merge pull request #13 from avamel/country_tour

Country tour