Create develop branch
change password for user swift to 'password'
test
Merge branch 'develop'

Conflicts:
	CHANGE_LOG