Start of controls view
Merge branch 'master' of github.com:LVsam/aerial