working in the home page
Merge branch 'master' of https://github.com/ScalablePath/LeapMotionPOC

Conflicts:
	web/css/base/helpers.less
	web/css/base/miscellaneous.less
	web/css/main.css