oops
Merge branch 'master' of https://github.com/louisroy/chekov

Conflicts:
	javascript/js/app.js
	ui/search.php
gitignore file