Merge branch 'james'

Conflicts:
	.gitignore
	Gruntfile.js
	app/bower_components/bootstrap/fonts/glyphicons-halflings-regular.svg
	app/bower_components/bootstrap/fonts/glyphicons-halflings-regular.ttf
	app/fonts/glyphicons-halflings-regular.svg
	app/fonts/glyphicons-halflings-regular.ttf
	app/index.html
	app/scripts/app.js
	app/scripts/controllers/eventinfo.js
	app/scripts/controllers/recipeinfo.js
	bower.json
	lib/bootstrap-3.2.0-dist/fonts/glyphicons-halflings-regular.svg
	lib/bootstrap-3.2.0-dist/fonts/glyphicons-halflings-regular.ttf
	package.json
	test/spec/controllers/eventinfo.js
	test/spec/controllers/recipeinfo.js