what the hell the dropbox pc make code so mess
fix some bugs
Merge branch 'master' of https://github.com/CapsLock-Studio/QuoiQuoi

Conflicts:
	app/controllers/search_controller.rb
	app/views/search/index.html.erb