Merge branch 'develop' into sms
hoiio smstest

Signed-off-by: Alexander Skjolden <alex@plastboks.net>
Merge branch 'sms' into develop