Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'tucker/master'
Removed non-admin actions from admin controller
Outline of admin function
Removed non-admin actions/view
Merge remote-tracking branch 'john/master'

Conflicts:
	application/controllers/LoginController.php
	application/models/UpdateFundForm.php
ACL rules now allow error page to be displayed for all roles inheriting
from GENERAL.
Client side validation of Limit adjustments added
Reworked file structure for admin models.
Adjusted AuthPlugin based on new error page ACL rules.
utility javascript file with helper functions
	modified:   application/Bootstrap.php
Merge github.com:tuckerg/SVDP into tuesday-test

Conflicts:
	application/Bootstrap.php

	modified:   .gitignore
	modified:   README.markdown
	new file:   SVDP Database.txt
	new file:   Test Data INSERT.txt
	modified:   application/Bootstrap.php
	modified:   application/configs/application.ini
	modified:   application/controllers/IndexController.php
	modified:   application/controllers/LoginController.php
	new file:   application/controllers/MemberController.php
	modified:   application/controllers/SearchController.php
	new file:   application/controllers/TreasurerController.php
	new file:   application/models/Addr.php
	modified:   application/models/AdminForm.php
	new file:   application/models/Case.php
	new file:   application/models/CaseForm.php
	new file:   application/models/CheckReq.php
	new file:   application/models/Client.php
	new file:   application/models/ClientForm.php
	modified:   application/models/ForgotForm.php
	modified:   application/models/LoginForm.php
	new file:   application/models/MapForm.php
	new file:   application/models/SearchFormAbstract.php
	new file:   application/models/SearchFormMember.php
	new file:   application/models/SearchFormTreasurer.php
	modified:   application/models/UpdateFundForm.php
	deleted:    application/models/User.php
	new file:   application/views/scripts/case/case.phtml
	new file:   application/views/scripts/case/caseViewScript.phtml
	new file:   application/views/scripts/client/client.phtml
	new file:   application/views/scripts/client/clientViewScript.phtml
	modified:   application/views/scripts/layout.phtml
	new file:   application/views/scripts/map/Map.js
	new file:   application/views/scripts/member/case.phtml
	new file:   application/views/scripts/member/caseViewScript.phtml
	new file:   application/views/scripts/member/client.phtml
	new file:   application/views/scripts/member/clientViewScript.phtml
	new file:   application/views/scripts/member/index.phtml
	new file:   application/views/scripts/partial/navigation.phtml
	new file:   application/views/scripts/partial/searchResultCase.phtml
	new file:   application/views/scripts/partial/searchResultCheckReq.phtml
	new file:   application/views/scripts/partial/searchResultClient.phtml
	new file:   application/views/scripts/partial/searchResultCommon.phtml
	modified:   application/views/scripts/search/member.phtml
	modified:   application/views/scripts/search/treasurer.phtml
	new file:   application/views/scripts/treasurer/index.phtml
	modified:   library/App/Acl.php
	deleted:    library/App/AuthService.php
	new file:   library/App/Escaping.php
	new file:   library/App/Formatting.php
	deleted:    library/App/Helper/AuthCheck.php
	modified:   library/App/Resources.php
	new file:   library/App/Service/Member.php
	new file:   library/App/Service/Search.php
	modified:   public/main.css
	new file:   public/svdp_logo.jpg
Report Controller-Work in progress
Merge remote-tracking branch 'testing/master'
	modified:   SVDP Database.txt
	modified:   SVDP Database.txt
updated report controller
	modified:   application/Bootstrap.php
Merge remote-tracking branch 'tucker/master'
Merge with newest version
Merge https://github.com/gwdickson/SVDP into report-test
Modified file structure for login models.
	modified:   application/Bootstrap.php