Adding wysiwyg to annotations.
Merge branch 'master' of https://github.com/natoine/Argumentea

Conflicts:
	ArgumenteaServer/conf/routes