Fixes #68
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/ng-csv/directives/ng-csv.js