Exploring canvas for pmi.
忽略couchdb输出的日志文件
Merge remote-tracking branch 'slycat/master'
修订model-timeseries.html中误删括号，导致的语法错误
Add autocomplete for typing the path and begin initial small refactoring
Get rid of second next button
Implement a blacklist filter for certain image types and other types we might want to block. Will refactor soon. This should be a whitelist...
Get rid of some needless extra iterations over the attribute array. This will be faster.
Experimenting with canvas
Adding events to canvas
Switch to plugins to handle specifying available markings.
Merged master to file browser branch
Adding canvas element, scaling it, creating canvas scales for point placement.
More updates
Merge remote-tracking branch 'origin/master' into file_browser_improvement
Move some of the styles to the stylesheet. Use classes that can be used across all of the model types
Get rid of inline styling and instead put the proper classes that will be used across model types
Fix sliding issue in file browser when expanding a same level folder other than the one open. Also add a message notifying the user a folder is empty if it is the case.
Merge branch 'dev'

Conflicts:
	.gitignore
	couchdb.stderr
	couchdb.stdout
忽略couchdb输出的日志文件