small changes.  Still working on getting bCrypt working. [securityExt]
small changes.  Still working on getting bCrypt working. [securityExt]
work continues
Merge branch 'master' into borderPane
Merge branch 'master' into securityExt
Started on border pane.  Just experementing with the different options
Merge branch 'securityExt' into borderPane
Working on borderPane
More changes to borderPane.  Playing with the different pane functionality.
Updated Makefile
Comment out java bcrypt import that was causing errors
Commented out java bcrypt import that was causing errors
update
Merge branch 'master' of github.com:HoneyBadgersInc/FantomCMS
Merge branch 'master' into josh
update
Merge branch 'master' of github.com:HoneyBadgersInc/FantomCMS
update
Small changes
Merge branch 'master' of github.com:HoneyBadgersInc/FantomCMS