Merge branch 'master' of https://github.com/Lobomon/Editor-Qt

Conflicts: (Solved)
	EasyRPG-Editor.pro
	src/dialogdatabase.cpp
	src/dialogdatabase.h
	src/dialogdatabase.ui
	src/tools/qdbpageactors.cpp
	src/tools/qdbpageclasses.cpp
	src/tools/qdbpageclasses.h
	src/tools/qdbpageclasses.ui