# Conflicts:
#	.travis.yml
#	tests/data/user.js
#	tests/steps/04-main-elements-render.js
#	tests/steps/API.js