More unified config
Merge branch 'wfc-legacy'
Merge branch 'cc-integrate'
Merge branch 'cc-integrate'
Merge branch 'cc-integrate'
FIX: select tag w/ size=2 was confusing
Merge branch 'bugfixes'
Controllers for updating and delete products. The controller is
aware of prodUpdate so audit records are added automatically.
Added option to avoid creating new product records. Default
behavior of auto-create still makes sense to me.
Documentation for Fannie Plugins
Change includes for compatibility with official documentation
Merge branch 'akt-calendar-plugin' into akt-master
Base class for AJAX callbacks
Fixed missing $this->
Merge branch 'akt-bugfixes' into akt-master

Conflicts:
	fannie/classlib2.0/FannieWebService.php
Update calendar to use web service class
Directions for porting existing code into Fannie
Merge branch 'akt-doc' into akt-master
PHPUnit based unit testing
Changes to files in fannie are path related to make unit testing
work correctly. The bootstrap.php file is needed to make
config.php available to unit tests.
Merge remote-tracking branch 'origin/akt-unit-tests' into akt-master