Website update

Display event, Main page, Password change confirmation,
Merge with develop
Merge pull request #12 from kmahlin/TestWebsite

Test website