add new lines at end of files
remove trailing whitesspaces
Merge branch 'staging' into 241-integrate_cucumber

Conflicts:
	Gemfile.lock