add aroute to edit slide content
add a link to the slide editor
tweaking of iframe attribut
the slide edit view
Merge branch 'dev' into editor
end of merge
meteor update
get data from the client
add method to update the content of a slide
formating
cleaning logging and comment
changes due to separate slides collection
formatting
update slide
trime the content before rendering
Updated to Meteor 1.0.1, everything seems to work properly.
Merge branch 'editor' into dev
Merge branch 'dev' into imageUpload

Conflicts:
	.meteor/versions
	server/methods.js
Merge branch 'imageUpload' of github.com:SlideSyncOrg/SlideSync into imageUpload

Conflicts:
	server/methods.js