removed version number in conf.py
update documentation
update documentation and put angularparser as a devDependency
Merge branch 'master' into 1.x

Conflicts:
	coffee/docxgen.coffee