stm stuff
Merge branch 'master' of github.com:metosin/bootcamp-2

# By Juho Teperi
# Via Juho Teperi
* 'master' of github.com:metosin/bootcamp-2:
  Fixed uberjar etc.
  Fix source paths