Merge branch 'origin/master'
Added Homepage/Stylings
jsp/css