2.3.1 release
Merge branch 'dev' of github.com:Canadensys/canadensys-explorer into dev