#18
Merge branch 'master' of github.com:ProgerXP/Notepad2e

Conflicts:
	bin/Notepad2.exe
	bin/Notepad2.ini
	src/_version.h