angular and jquery wip
bloody merge conflicts
work!
Merge branch 'giorgia' of https://github.com/giorgia-amici/RingMyBellBJ into giorgia
MERGING!!!!!