Rolled Back this commit because of problems in IE and Firefox
Merge branch 'Dev_Files_Aileen' of https://github.com/felixmueller1989/glf_projekt into Dev_Files_Aileen