add adapter to .gitignore
Merge branch 'master' into dev
Merge branch 'master' into dev
start adding load config options
Merge branch 'master' into dev
prepare for file upload
get layout started for importing file
more work on setting up file config importing
add parsev2 plugin and continue implementing config import
reworking config import, created new views, templates, and controllers
test actions
move parser into import controller and view
finish implemeting config import into ember, may need testing
remove parser from vendor import file
add flash messages to import events
change crosshair canvas lock position with new import element
add importing instructions and adjust styles
improve crosshair locking
fix errors when crosshair page is not visible
comment out console logs