make changes to support Habari 0.10
Update version number to 0.5
Merge branch 'experimental'