Changed name of bower package
Merge branch 'master' of github.com:theonion/video-ad-server-frontend

Conflicts:
	bower.json