Merge branch 'dev'
Merge branch 'dev' of github.com:qltd/s2015 into dev