use bower to get almond
fix a wrong assumption
bump
Merge remote-tracking branch 'origin/master' into development

Conflicts:
	core/extension.js