More package work.
Merge branch 'master' of https://www.github.com/foam-framework/foam

Conflicts:
	core/FOAM2.js