updated info, added ngdocs and basic templates for documentation, refined some task
Merge remote-tracking branch 'origin/master'

Conflicts:
	package.json