Merge dev and leapmotion changes to master.