add dox task
Merge branch 'topic-dox'

Conflicts:
	.gitignore