Merge pull request #32 from bhutchinson/master

KFSTP-1402 Squashed commit
KFSTP-1403
merged from release-5-3-1
Merge pull request #33 from kkronenb/master

Merge from 5.3 branches as well as the last CGB commit in svn
Readding file that was mysteriously removed
Merge pull request #34 from kkronenb/master

Readding file that was mysteriously removed
 Automated database schema update from KFS5CGBDBA - 20141103-2204
KFSTP-1419

Squashed commit of the following:

commit c945a1998246519e241b57c867406d28f365e23f
Author: bhutchinson <bryan.hutchinson@cornell.edu>
Date:   Tue Nov 4 09:05:06 2014 -0500

    KFSTP-1444 add files that are extracted from the Rice web war to .gitignore and remove from git

commit be0be25aa64bd2417b7664f4861532c1d4b6b39e
Author: bhutchinson <bryan.hutchinson@cornell.edu>
Date:   Mon Nov 3 15:42:40 2014 -0500

    KFSTP-1447 fix Rice source jar naming