Merge branch 'master' into iss13
Merge branch 'iss13'
Merge branch 'master' of github.com:maur1th/naxos-project
Added search results template.