Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	src/api/ecw/order.js

public/static/plugins/pdfviewer/cmaps/CNS2-V.bcmap

+RCopyright 1990-2009 Adobe Systems Incorporated.
+All rights reserved.
+See ./LICENSECNS2-H
\ No newline at end of file

public/static/plugins/pdfviewer/cmaps/ETenms-B5-H.bcmap

+RCopyright 1990-2009 Adobe Systems Incorporated.
+All rights reserved.
+See ./LICENSE	ETen-B5-H`
 ^

\ No newline at end of file

public/static/plugins/pdfviewer/cmaps/GB-H.bcmap

+RCopyright 1990-2009 Adobe Systems Incorporated.
+All rights reserved.
+See ./LICENSE

!!]aX!!]`21>	pz$]"Rd-U7*
4%+ Z {/%<9Kb1]."`],"]
+"]h"]F"]$"]"]`"]>"]"]z"]X"]6"]"]r"]P"]."]"]j"]H"]&"]"]b"]@"]"]|"]Z"]8"]"]t"]R"]0"]"]l"]J"]("]"]d"]B"] "X~']W"]5"]"]q"]O"]-"]"]i"]G"]%"]"]a"]?"]"]{"]Y"]7"]"]s"]Q"]/"]
"]k"]I"]'"]"]c"]A"]"]}"]["]9
\ No newline at end of file