added migration for 'country_code' for User, updated specs and changed instances of 'country' to 'country_name'
cucumber tests fixed after changing country method name