Merge branch 'develop' of https://github.com/kmb385/ToThoughtWebLayer into develop