removed zip
Merge remote branch 'origin/master'

Conflicts:
	color_box.zip
removed erronous testing line
?
- trying to bring in some structure into the save() function
- added all colorbox options into the form

TODO:
- mike can you add all the colorbox default values to all p tags?
just like this: <p><?php echo t('Text for the next button in a shared relation group (same values for "rel" attribute). <strong>Default: "next"</strong>')?></p>
- for the html option: "We need a c5 popup that opens a c5 editor in here."
- fixed synthax error in the form
merge
Merge remote branch 'origin/master'

Conflicts:
	color_box.zip
	color_box/blocks/color_box_image/controller.php
- idk why I commit.. maybe to be sure I commited..
- switchable colorbox themes commit from a few years ago