Merge branch 'master' of https://github.com/leapmotion/MagicMirror

Conflicts:
	frames/magicmirror/hives/drawing/actions/draw/static/js/scriptTwoPanels.js
`
Merge branch 'master' of https://github.com/leapmotion/MagicMirror into nancy
Merge branch 'master' of https://github.com/leapmotion/MagicMirror into nancy
Merge branch 'master' of https://github.com/leapmotion/MagicMirror

Conflicts:
	frames/magicmirror/hives/drawing/actions/draw/static/js/scriptTwoPanels.js
`