Non alpha sort#323

fogelito wants to merge 3 commits intomainutopia-php/database:mainfrom

sort-alphautopia-php/database:sort-alphaCopy head branch name to clipboard