Fix some warnings
Merge remote-tracking branch 'origin/master'

Conflicts:
	lib/geotime/Import.php
	lib/geotime/Util.php
Merge branch 'master' of https://github.com/bperel/geotime
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Add Xpath tests