Changes in AppBuilder made by Tina.
Merge branch 'master' of https://github.com/tstancheva/Sample.git

Conflicts:
	Ticket857231/index.html