Merge branch 'master' into mediawiki

Conflicts:
	vizgrimoire.min.js
Merge branch 'mediawiki' of https://github.com/VizGrimoire/VizGrimoireJS into mediawiki

Conflicts:
	vizgrimoire.min.js
Merge branch 'mediawiki' of https://github.com/VizGrimoire/VizGrimoireJS into mediawiki
Merge branch 'mediawiki' of https://github.com/VizGrimoire/VizGrimoireJS into mediawiki
Merge branch 'mediawiki' of https://github.com/VizGrimoire/VizGrimoireJS into mediawiki
Merge branch 'mediawiki' of https://github.com/VizGrimoire/VizGrimoireJS into mediawiki
Merge branch 'mediawiki' of https://github.com/VizGrimoire/VizGrimoireJS into mediawiki
JSON data will be generated from Automator
Merge branch 'mediawiki' of https://github.com/VizGrimoire/VizGrimoireJS into mediawiki