Merge branch 'hotfix-1.1.2' into dev
Merge branch 'hotfix-1.1.3' into dev
improve search results view
change name to warLock
remove borders from search line_items
Merge branch 'table-view' into dev
changed Create Lock Files button to use all files
Merge branch 'create-lock-files' into dev
release housekeeping
Merge branch 'release-1.2.0'