Merge branch 'hotfix_0.6.12'
saving work in progress before ubuntu upgrade
hack to fix x-editables with select2 and validations
[#69093684]inline editing for taxon_concept_term_pairs
[#69093684]modal editing for taxon_concept_term_pairs
[#69093684]editing for term_trade_codes_pairs
[#69093684]basic navigation links
[#69093684]implemented search
[#69093684]added partial
[#69093684]added pairings in top nav
[#69093684]removing unused views
[#69093684]removing validation
[#69093684]fix for conflicting js files and hack for select2
[#69093684]deleted empty file
[#69093684]deleted unused file
[#69093684]small fix
[#69093684]fixed heading in table
[#69093684]removed unused js code
[#69093684]pull request fixes
[#69093684]reset select2 on modals on validation errors