search ui
browse controller
trivial
trivial2
trivial3
tied Auction and Direct with Front End
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/routes.php