Added objects, fixed fixtuers.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	.meteor/packages
	.meteor/versions