gallerie -> galerie and blog link added in navbar
gallerie -> galerie
gallerie -> galerie
link to blog added
blog merge
add nbproperties
protect some files
bug correction in get disciplineList
Merge branch 'master' of https://github.com/ckiw/osmltir-admin.git