Changes made by Ivan I. Ivanov (ivani.ivanov@telerik.local).
Merge branch 'master' of https://github.com/ivanovit/aaa.git

Conflicts:
	Test1/index.html