continued development (refinement) of the Decoders tab
Merge branch 'feature/webui' of github.com:ldaniels528/trifecta into feature/webui

* 'feature/webui' of github.com:ldaniels528/trifecta:
  continued development (refinement) of the Decoders tab

Conflicts:
	src/main/resources/app/js/controllers/DecoderCtrl.js
	src/main/resources/app/views/decoders.htm