consolidated teh templates into a single one
Merge branch 'master' of github.com:TargetRAD/gsa-app

Conflicts:
	views/polar.handlebars