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

Conflicts:
	frames/magicmirror/hives/drawing/actions/home/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

Conflicts:
	frames/magicmirror/hives/drawing/actions/home/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

Conflicts:
	frames/magicmirror/hives/drawing/actions/home/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

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