update
Merge branch 'master' of github.com:mediapeers/mpx-um-frontend-artifacts

Conflicts:
	dist/index.html
	dist/scripts/bower-b7af0a46.js
update