search form tpl
Merge remote-tracking branch 'pf/master'

Conflicts:
	frontend/web/app/router.js
search form tpl
Merge pull request #8 from ilya3d/master

search form tpl