resource(dictionary) expansion
Merge remote-tracking branch 'lizrush/develop' into develop

Conflicts:
	app/assets/js/resources/insults.js
	app/assets/js/resources/presentations.js