Last Changes

To display Journey Info
Merge branch 'master' of https://github.com/merceamoroscon/TESTPROYECTO
languages
Merge remote-tracking branch 'origin/MERCE'

Conflicts:
	packages/jquery-globalize.0.1.1/Content/Scripts/jquery.globalize/cultures/globalize.cultures.js
conflicts
Merge remote-tracking branch 'origin/master' into MERCE

Conflicts:
	packages/jquery-globalize.0.1.1/Content/Scripts/jquery.globalize/cultures/globalize.cultures.js