Merge pull request #399 from Smoothieware/edge

stable edge before multitool
update firmware.bin fir master
Merge branch 'edge'

Conflicts:
	FirmwareBin/firmware.bin
Merge pull request #490 from wolfmanjm/upstreamedge

Fix switch state sio it is false if PWM switch and S0
DHCP option 12 support (hostname)
Merge remote-tracking branch 'upstream/master' into edge

Conflicts:
	FirmwareBin/firmware.bin
Merge pull request #491 from soldierkam/edge

DHCP option 12 support (hostname)
Added install instructions for Homebrew users

Mac OS X users of Homebrew can install gcc-arm-embedded from a Formula
Merge pull request #494 from bfoz/patch-1

Added install instructions for Homebrew users
update firnware.bin and checksum
Merge branch 'edge' of github.com:Smoothieware/Smoothieware into edge
Update README.creole
Update README.creole

revert addition that installs a different compiler.
Added support for Win32 git version string generation
Added support for Win32 git version string generation
Merge pull request #498 from hogthrob/edge

Added support for Win32 git version string generation
Approach to generate branch name for version string now identical to linux/macos_x approach
Approach to generate branch name for version string now identical to linux/macos_x approach
Merge remote-tracking branch 'upstream/edge' into edge
Merge pull request #499 from hogthrob/edge

Change win32 git branch extraction to use same approach as generate-version.sh