Merge pull request #2 from manhertz/master

osszerakni?
ujra3
Merge pull request #3 from manhertz/Ticket_1

ujra3
Merge pull request #4 from manhertz/dev

Merge pull request #2 from manhertz/master
ticket2 commit
Merge pull request #5 from manhertz/Ticket2

ticket2 commit
Merge branch 'master' of https://github.com/manhertz/kiserlet into ticketA

Conflicts:
	kiserlet/kiserlet.php
Merge branch 'master' of https://github.com/manhertz/kiserlet into ticketA

Conflicts:
	kiserlet/kiserlet.php