Updated changelog
Changed version to 2.3.3-dev
Merge remote-tracking branch 'origin/master' into develop

* origin/master:
  Changed version to 2.3.3-dev
  Updated changelog
Changed version to 2.4.0-dev and added update script for db