issue3
add comment /*update by trump*/
add a file
Merge branch 'issue3'
issue1 ronglin, edit app.js add c.png
issue2
issue4
Merge branch 'origin/sprint1'

Conflicts:
	Sample.Web/Cms_Data/Sites/Travix/Scripts/app.js
Merge branch 'sprint1' to master