Postgre compatible
Merge branch 'master' of github.com:WissKI/wisski_pages

Conflicts:
	wisski_pages.module