issue1
issue2
issue3
Merge branch 'issue2'
Merge branch 'issue3'

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