Update manifest.webapp
Update manifest
Merge remote-tracking branch 'origin/gh-pages'

Conflicts:
	manifest.webapp

Merge
Merge pull request #7 from mastro-elfo/master

Update manifest