fixing modal templates for minifying
Merge commit '9dbb16cb77c487208cf46e329b7afd1aaf6cc264'

Conflicts:
	Gruntfile.js