working manifest html
link to manifest and permissions in index
Merge branch 'divyac'

Conflicts:
	webapp/app/main/views.py
	webapp/app/templates/index.html