changes to get working on ubuntu LTS 12.04
fix for ubuntu
Merge branch 'master' of https://github.com/iMMAP/OasisWebMapping

Conflicts:
	php/dbconnect.php
gitignore and temp files