Cleaned up main package and redirected landing page (http://localhost:8080/) to be the login page
Merge remote-tracking branch 'origin/master' into master-real