Merge remote-tracking branch 'origin/master'

Conflicts:
	index.html
Merge pull request #2 from sap-design-studio-free-addons/master

Merge remote-tracking branch 'origin/master'