fix bugs
Merge branch 'master' of github.com:punchdrunker/koala

Conflicts:
	views/graph.erb