test
Merge branch 'master' of https://github.com/Callilol/bpifind

Conflicts:
	app/views/admin/collections/index.html.haml
Merge branch 'master' of https://github.com/Callilol/bpifind
multiselect
.gitignore is now working