first commit
Merge https://github.com/buehlems/sma_web