update roadmap status MAID-526
Merge remote-tracking branch 'upstream/master' into gh-pages
add template conditions to not include newer js files, update SAFE Network -> SAFE network in various places
Merge branch 'ioptio-gh-pages'
MAID-526 correction.