Backend integration
Merge branch 'master' of https://github.com/jamesfebin/boutline4sports

Conflicts:
	.meteor/packages
	client/views/dashboard/rightnav.html
	packages/.gitignore
	smart.json
	smart.lock