olsen

Conflicts:
	CHANGELOG.txt
	app/alloy.js
	app/config.json
	manifest