Connected search result to rincian
Merge branch 'master' of https://github.com/YuliusN/IF3038-2013

Conflicts:
	TUBES II/src/Dashboard.php
	TUBES II/src/php/index.php