Merge branch 'master' of github.com:collectiveaccess/providence into spreadsheet
Merge branch 'master' of github.com:collectiveaccess/providence into spreadsheet
Merge branch 'master' into spreadsheet

Conflicts:
	app/conf/javascript.conf
Merge branch 'master' into spreadsheet
Fix typo
Merge branch 'spreadsheet' of github.com:collectiveaccess/providence into spreadsheet
Merge branch 'master' into spreadsheet
Merge branch 'master' of github.com:collectiveaccess/providence into spreadsheet
Mild improvement in speed
Mild improvement in performance
Remove crappy session-based caching
Move to Zend-cache based session var storage. Allows us to avoid crappy PHP session locking issues
Remove redundant line
Remove obsolete code
Add SSL SMTP directives
Fix regression that caused template delimiter options to be ignored
Merge branch 'master' of github.com:collectiveaccess/providence
Updated controllers to support editable
Added editable views
Update spreadsheet editor js