Merge https://github.com/JimHough/MeteorProjects

Conflicts:
	Autoform/public_html/client/main.html
	Autoform/public_html/client/main.js
	Autoform/public_html/client/stylesheets/style.css
	Autoform/public_html/collections/Books.js
	Autoform/public_html/server/publications.js
	CollectionFS/nbproject/project.properties