Port to new flight version
Merge pull request #15 from boom1992/master

Port to new flight version for User controller