New add/edit usage screen (part 1)
merge changes
Merge branch 'master' of github.com:Sch3lp/ducking-octo-archer
New add/edit usage screen (part 2)
merge