testing ment.io
Merge remote-tracking branch 'nikola/user-mentions-ui' into devel

Conflicts:
	bower.json
fix(e2e): make e2e tests pass