search wi
give up angular, use backbone
client skeletton
bug fix core
Merge remote-tracking branch 'origin/master'

Conflicts:
	server/lib/tokenizer.coffee