Dynamic search in "Right way"
Merge branch 'DynamicSearch'

Conflicts:
	gruntfile.coffee
	scripts/server.coffee
	views/index.jade