zzz
Merge branch 'Searchscreen' of https://github.com/terryvdgriend/Interactive-Website into Searchscreen

Conflicts:
	php_project/Classes/Default/Search.php
	php_project/Interactivewebsite/Search/Screen.php