updates documentation, dependencies
Merge branch 'origin/master'

Conflicts:
	Gruntfile.js
	README.md
	docs/README.tmpl.md
	package.json
updates dependencies, documentation
0.1.2