changelogs for the v2.2.0 version (a little bit late)
Merge remote-tracking branch 'upstream/master'
ssl only for the root domain
add 2 new liquid tags: parse_date_time and parse_date
use solid which makes the writing of liquid tags and blocks super easy + force the locale to the default one when getting a token + add the timezone attribute for the site (API)
upgrade to rails 3.2.14 + fix tests
all the tests pass in ruby 2.0.0
add markdown liquid filter
only ruby 2.0 for travis tests
Made membership accept account email through the api

Conflicts:

	Gemfile.lock
refreshing serialized page templates works now + improve the with_scope tag + replace paths to woff assets in all the css files
add migration for localizing redirect_url of pages
do not stop the execution of the migration if a theme_asset does not have a file + add the logger when rendering a liquid template
Merge pull request #793 from colibri-software/fix_membership_api

Made membership accept account email through the api
The API now returns a proper content type when asking for a given entry.
Merge pull request #799 from peterssonjesper/master

The API should return a proper content type when asking for entries
use parsed_response to retrieve remote entries + when the type of an editable_xxx element was changed, in some context, it raised an exception, the process now is more consistent
[➠] Added translation for “de.locomotive.shared.menu.translations”.
Merge pull request #801 from mkempe/fix_admin_ui_de

Added translation for “de.locomotive.shared.menu.translations”.
fix issue #798 + domains are now available directly in a liquid template as well as the current host