transfer
Merge branch 'master' of https://github.com/witbeyondmeasure/arsys

Conflicts:
	css/font.css
	css/search_result.css
	views/search_result.html