Fix: schema.rb
Merge branch 'issue-1333'
Merge branch 'master' of github.com:MarkUsProject/Markus
Merge branch 'master' of github.com:MarkUsProject/Markus
Merge branch 'master' of github.com:MarkUsProject/Markus
Merge branch 'master' of github.com:MarkUsProject/Markus
Calendar_date_select: Using a gem instead of vendor/plugins
Removing vendor/plugin calendar_select date and installing it from gem.
Command "bundle exec rake calendar:install" should be execute for correct installation.
Adding gemfile.lock after setting calendar as a gem.
Rebasing branch into master
Merge branch 'master' of github.com:MarkUsProject/Markus
Remove SSL requirement
Merge branch 'issue-1324-calendar'