issue4
#issue2
#issue3
#issue5
hotfix1
Merge branch 'origin/#issue3'

Conflicts:
	Sample.Web/Cms_Data/Sites/Travix/Scripts/app.js
Merge branch 'origin/issue5'
Merge branch 'origin/issue2'
Merge branch 'origin/issue4'

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