Preparing to reorganize dev env.
Reorganizing dev environment
Merge branch 'jen' of walle:~/jairo into jen

Conflicts:
	node/jainode.js
Merge branch 'jen' of l3:~/jairo into jen
Daily commit of work on widgets.
Merge branch 'jen' into david
Merge branch 'jen'
Merge branch 'david'
Working on widget list widget.
Working changes to things Jen was working on before David interrupted.
Merge branch 'jen'
Updating jQuery to 1.10.2 in jai index and basicNetwork app index; also pruning lib references that are redundant in v/ files (because they're already included in the index file). Note: evaluate including datatables and jeditable in index rather than individual files, if applicable.
Merge branch 'david'
Updating jQuery and jQueryUI versions, replaced links with symlinks for easy updating in future, and updated jQueryUI assets. TODO: replace arrows on rollers with old colors.
Merge branch 'david'
Major restructuring to alleviate growing pains in upgrading and more tinkering with the widget list and VPN widget.
Merge branch 'david'

Conflicts:
	apps/basicNetwork/index.php
making widgets
Merge branch 'jen' of l3:~/jairo into jen
Configuration file reshuffling for vpnclients, and further development in the vpnclient widget. Added javascript cache files to gitignore. The current arrangement, with vpnclients and vpnservers being top-level categories in etc.js is probably undesirable, but until we replace etc.php with something that serves subcategories as well as categories in etc.js, this keeps the client page from having server information in it, and vice versa.