Merge branch 'edge' of https://github.com/Smoothieware/Smoothieware into myedge
Merge branch 'edge' of https://github.com/Smoothieware/Smoothieware into myedge
Merge branch 'myedge' of https://github.com/hakalan/Smoothieware into myedge
Merge branch 'myedge' of https://github.com/hakalan/Smoothieware into myedge
Bugfixes to webif