fixed missing else bug
Merge branch 'master' of github.com:moiri-gamboni/travellog
country field removed
fixed merge conflicts
fixed merge conflicts
merge and dependency fix