Various changes
Merge branch 'master' of https://github.com/jasmingacic/katoadhoc

Conflicts:
	PHP/index.php