Bug 925370 - Update e.me app on aurora
Merge branch 'eme-updates' of https://github.com/teodosia/gaia into eme-updates

Conflicts:
	tests/python/gaia-ui-tests/gaiatest/tests/functional/everythingme/test_everythingme_launch_app.py