Some problems
Merge branch 'dev' of https://github.com/engsyst/ftua into dev