Merge pull request #35 from HSkogmo/master

Many new shiny features
Merge pull request #36 from HSkogmo/master

TO THE CLAUD!!!!111!one
adding ,usa
Merge branch 'master' of github.com:Filip-Ter/Smart-Travel
fj
Merge pull request #37 from HSkogmo/master

Fixing DB stuff
changing php
Merge pull request #39 from gempio/master

changing php
Fixing typo in core