updated for html print
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/app/directives.js