added staging branch to travis.yml as well as xvfb support for selenium tests
Merge branch 'development'

Conflicts:
	.travis.yml