merge plus changes
Update to use the new readers liblcf
Merge branch 'master' of https://github.com/MarianoGnu/Editor-Qt

Conflicts:
	.gitignore
	EasyRPG-Editor.pro
	EasyRPG-Editor.pro.user.7746fbb
	libs/README
	src/mainwindow.cpp
	src/mainwindow.h
	src/tools/QGraphicsMapScene.cpp
	src/tools/QGraphicsMapScene.h
	templates/Player64.exe
Errors from the merge
Merge branch 'master' of https://github.com/Lobomon/Editor-Qt into lobomon
Update gitignore.
Merge pull request #1 from MarianoGnu/lobomon

Update gitignore
New map interface Created
Merge branch 'master' of https://github.com/EasyRPG/Editor-Qt
Merge branch 'master' of https://github.com/Lobomon/Editor-Qt
Merge pull request #9 from Lobomon/master

Updated events plus new map