Added Test
Merge branch 'dev'
Merge branch 'dev'
wip
add gradients
merge
add graph.html
add check to create
Merge branch 'dev' into typeahead

Conflicts:
	coffee/client/main.coffee