fixing styles.
fixing styles
fixing merge
Merge branch 'master' of https://github.com/ScalablePath/LeapMotionPOC

Conflicts:
	web/css/base/modules.less
	web/css/main.css