Resolved notifications.js namespace conflict
Added popups.js
Merge branch 'prc33'

Conflicts:
	src/main/webapp/templates/frontend/main.soy