Merging changes of work into master

* Modules
* Mysql
* Psql