added max_temp config option to temperaturecontrol
fix typo
Merge pull request #535 from Smoothieware/max-temp

Confirmed to work
update firmware.bin
Add multiple temps to panel watchscreen if there are more than two enabled, top line cycles through different temps every 5 seconds
Merge pull request #536 from wolfmanjm/feature/more-temps-in-watchscreen

Add multiple temps to panel watchscreen if there are more than two enabl...
add icons for hotends 2 and 3
Merge pull request #537 from wolfmanjm/upstreamedge

add icons for hotends 2 and 3
Merge remote-tracking branch 'upstream/edge' into edge
update firmware.bin
add StepperMotor::get_last_milestone()
Merge pull request #538 from wolfmanjm/upstreamedge

add StepperMotor::get_last_milestone()
Merge remote-tracking branch 'upstream/edge' into edge
Added code for M0 pause
Changed ZGrid25 movement to suit Beast and Morgan