update version #
update copyright
Merge branch 'development'

Conflicts:
	markdown.c