issue2
Merge branch 'origin/sprint1'

Conflicts:
	Sample.Web/Cms_Data/Sites/Travix/Scripts/app.js