Makes calendar always appear, and fixes logic with the checkbox
swconley, friscis
Merge remote-tracking branch 'upstream/sbl-dev' into sbl-dev
Merge pull request #374 from benkorza/sbl-dev

Fixes all type java doc conventions
Merge pull request #373 from friscis/sbl-dev

Makes calendar always appear, and fixes logic with the checkbox
Merged Sam's pull request #375
There was a conflict between Lisa's tests for Decks, and Sam's new deck stuff, because Sam deleted those files.  But the old tests still work with the new setup because the names are the same, so I'm leaving the tests in.

Signed-off-by: ajthompson
Fix Jenkins build for Lisa's tests
Tests DeckEntityManager
Merge pull request #377 from labatbouta/sbl-dev

Tests DeckEntityManager
Merge pull request #379 from bbiletch/sbl-dev

Fix Jenkins build for Lisa's tests
Checked out by Ben
bnkorza
Fixes javadoc conventions