Merge KBS/master

Conflicts:
	KBS/index.php
new Php files and renames,links should work properly,