Another attempt at linebreaking
Merge branch 'dev' of github.com:ShelvAR/ShelvARApi into dev