add search
Merge branch 'master' of https://github.com/Ninja-Squad/geektic

Conflicts:
	GeekTic.ipr
	GeekTic.iws
	conf/dependencies.yml
Merge branch 'master' of https://github.com/Ninja-Squad/geektic

Conflicts:
	GeekTic.iws