c
Merge branch 'viewsCollection' of https://github.com/Lauricio/ion-meteor into viewsCollection

Conflicts:
	client/client.js