Updated comments and formatted code to standards. The JSON string database table column is now a LONGTEXT type, holding up to 4GB of information.
progress on edit box
Merge remote-tracking branch 'origin/benV2' into brian
toolbar progress 3

toolbar can now select tools, probably (it does call selectTool(), but i
can't *really* test it without the server). but it's still kind of ugly,
and needs work.
edit popup progress
restorr peter's lost commit
trying to use uninitialized local fields, eh, peter?
editpopup semifunctional
change shape edit behavior to obey w/h constraints
added ability for strokewidth
window resize
Merge branch 'brian' of https://github.com/benzenittini/azosc into brian
Merge branch 'kilianV2' of https://github.com/benzenittini/azosc into brian

Conflicts:
	client/js/UI.js
fixed linewidth for freedraw
editpopup tweaks
Merge branch 'brian' of https://github.com/benzenittini/azosc into brian
Merge branch 'brian' of https://github.com/benzenittini/azosc

Conflicts:
	server/AzoscDatabase.java
Merge remote-tracking branch 'origin/master' into benV2