BugFix : header and links were removed by aloha
Merge branch 'master' of C:/Users/luc/Dev/Hg/bianca/dev/djaloha

Conflicts:
	djaloha/templates/djaloha/aloha_init.js