refs #6 Added login/logout buttons to any screens with JSPF.
Merge origin/develop into develop