removed dash
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/app/give/do/do.js
	src/app/give/do/do.tpl.html