Merge branch 'bug-expiration-field' into hotfixes
issue #691 email being in use
Merge branch '691' into develop
small fix on Search.php model
Merge branch 'hotfixes' into develop
improved createNewIndex function, if pk index differs, drop pk and add pk avoiding sql errors
removed alter at lower than 320, upgrade-funcs.php
changes pulled from osclass/dev branch