Added Username and Password to login screen.
Added check to see if admin when adding a new user.
Fixed all JOptionPane issues that were causing constant loading.
Merge remote-tracking branch 'origin/JSF2_local' into JSF2_local