Bower and calendar dependency stuff
Merge