Merge branch 'master' of https://github.com/qriver/springside_test

Conflicts:
	.gitignore
Merge https://github.com/qriver/springside_test