Kolejne uaktualnienia

Signed-off-by: mitabi <mitabi@actino.org>
Merge branch 'master' of https://github.com/mitabi/kalkulator

Conflicts:
	GUIFrame.cpp
	GUIFrame.h
	WxWizFrame.fbp
	bin/Debug/kalkulator.exe
	kalkulator.depend
	kalkulator.layout
	kalkulatorMain.cpp
	obj/Debug/GUIFrame.o
	obj/Debug/kalkulatorMain.o
	version.h

Signed-off-by: mitabi <mitabi@actino.org>