#23 merged navagation bar branch,
#23 merged navagation bar branch,

Brigette-Eckert/free-geek,Brigette-Eckert/free-geek,ECastro10/free-geek,Brigette-Eckert/free-geek,mbrochmann/free-geek,mbrochmann/free-geek,mbrochmann/free-geek,mbrochmann/free-geek,Brigette-Eckert/free-geek,ECastro10/free-geek,ECastro10/free-geek,ECastro10/free-geek