Merge branch 'hotfix/parsedate'
Use the json gem
Workaround for parsing string/numbers
Merge branch 'hotfix/backend' into develop

Conflicts:
	Gemfile