-
Merge branch 'master' of https://github.com/Werdffelynir/Qm

Conflicts:
	lib/DATABASE/QmDataBase.sqlite
Merge branch 'master' of https://github.com/Werdffelynir/Qm

Conflicts:
	lib/DATABASE/QmDataBase.sqlite
Merge branch 'master' of https://github.com/Werdffelynir/Qm

Conflicts:
	lib/DATABASE/QmDataBase.sqlite
doc info files
doc info files