Merge pull request #1 from abouthillier/master

Moved JBDC
Fixed the login page to show the icon.
Merge pull request #2 from ggodone-maresca/master

Fixed the login page to show the icon.