add bootstrap-3.1.1 resources
Merge branch 'master' into chrome-apps

Conflicts:
	web/index.haml