add description <p> to each category in block menu within accordion
Merge branch 'master' into 486_block_menu_descriptions
prettified ajax.js
Merge pull request #584 from waterbearlang/jsbeautify-ajax.js

Made ajax.js a little easier on the eyes
Expression if-then-else block
added help for all the block menus in the languages/javascript
added help for all the block menus in the languages/javascript
Merge branch 'master' into 486_block_menu_descriptions

Conflicts:
	dist/javascript.js
Merge pull request #589 from CelticMinstrel/master

Cool idea!
resolve merge conflict