merge
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	.meteor/packages
	client/views/posts/tran_item.html
	smart.json
	smart.lock