profile.php + search.php
Merge branch 'master' of https://github.com/allirf/IF3038-2013

Conflicts:
	TubesProgin2/Dashboard.php
	TubesProgin2/doc/spek tubes II PROGIN.docx
	TubesProgin2/profile.php