Filtering options at every select
Get last phpsql fixes
Merge branch 'master' into integration

Conflicts:
	phpsql