pushed to merge
Merge branch 'master' of https://github.com/Tabras/orange_system

Conflicts:
	orange_system/templates/searchTemplate.pt