Bump version to 1.1.4
Send device name in heartbeat if it exists
Merge branch 'develop' of github.com:ninjablocks/client into develop