Sidr + Ios knop
Merge branch 'master' of https://github.com/jeroenwouters/TaxiNu

Conflicts:
	application/config/config.php