1.1.x-dev
1.0.3
Merge branch '1.0'

Conflicts:
	src/Ciconia/Ciconia.php
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Ciconia/Ciconia.php
Merge remote-tracking branch 'origin/1.0' into 1.0
Fixes #31 '_' bug in parsing link and image
Merge branch '1.0'