Manifest
index.html
Update manifest.webapp
Merge branch 'master' into gh-pages

Conflicts:
	index.html
	manifest.webapp
Merge branch 'gh-pages' of https://github.com/brumouta/MAOE into gh-pages