Merge branch 'extractconvertdirectadaptation'

miguelnunes miguelnunes 2014-09-18

added error_shutdown_log
changed public/js/mainController.js
changed views/extraction.jade
error_shutdown_log Diff Switch to unified view
Loading...
public/js/mainController.js Diff Switch to unified view
Loading...
views/extraction.jade Diff Switch to unified view
Loading...