compatible with new permissions singleton
Merge branch 'master' of http://github.com/punkave/apostrophe-pages

Conflicts:
	index.js
Merge branch 'master' of http://github.com/punkave/apostrophe-pages