Merge pull request #45 from obeid/release-1

fixed z-index issue
my little changes
Merge remote-tracking branch 'upstream/release-1' into release-1
Merge pull request #46 from dazm12/release-1

Small welcome page changes
fixed merge conflict
fixed more merge confs
removed login from body of application