Feature/iteration 6 dev help panel merge in

Wants to merge the help panel stuff with the main dev branch