Commented out java bcrypt import that was causing errors
Merge branch 'master' of github.com:HoneyBadgersInc/FantomCMS
Merge branch 'master' of github.com:HoneyBadgersInc/FantomCMS
Merge branch 'master' of github.com:HoneyBadgersInc/FantomCMS
Merge branch 'master' of github.com:HoneyBadgersInc/FantomCMS
Merge branch 'master' of github.com:HoneyBadgersInc/FantomCMS
Merge branch 'master' of github.com:HoneyBadgersInc/FantomCMS
Merge branch 'master' of github.com:HoneyBadgersInc/FantomCMS
Loaded user JSON in login and fixed multi-query bug
Merge branch 'master' of github.com:HoneyBadgersInc/FantomCMS
Getting data from usergroup JSON
Readjusted user groups UI
Merge branch 'master' into user
Added sprint 2 report and scrumboard/burnupchart.
Merge branch 'master' of github.com:HoneyBadgersInc/FantomCMS
Merge branch 'master' into footer