Merge https://github.com/ibourgeois/BlackholeCMS
Merge branch 'master' of https://github.com/ibourgeois/BlackholeCMS