Custom properties and joins for the index pages of snippet types
Merge branch 'master' of http://github.com/punkave/apostrophe-snippets

Conflicts:
	index.js