Added search module
Merge branch 'master' into search

Fixed Conflicts:
	rdiodj/static/js/rdiodj.js
Misc search fixes