Added Devise
Added Calendar