Removed the lattice object
Add little balls to the end of the world coordinate axis markers when shown
made display a bit cleaner
pull (Jeffrey)
Merge branch 'master' of github.com:worklist/hifi
Added a startup timer
Merge remote-tracking branch 'origin' into startupTimer
Merge remote-tracking branch 'origin/startupTimer'
Resolved merge