try ng-docs
update
Merged 'dev'.

Conflicts:
	Gruntfile.js
	package.json
fix
changed package paths
changed grunt file
Merge branch 'feature-conversation-refactor'

Conflicts:
	.gitignore
	Gruntfile.js
	package.json
ngdocs begin
Finish docs
cleared stuff
changed gruntfile for packages
clean package from comps
kill packages fixxer
begun ngdoc with directives
new resource dir
Finish ngdocs-documentation
Merged 'dev'.