changed include to work also on linux for the needed pear geoIP class
Merge branch 'master' into develop
added composer