.
Merge branch 'master' of https://github.com/calfater/easyrium-remote-web

Conflicts:
	.travis.yml