Merge remote-tracking branch 'upstream/master' into branch2

Conflicts:
	public/less/app/pages/home/comps-details.less
Input call fixed
exposing sprite as a mixin
Merge remote-tracking branch 'upstream/master' into branch2

Conflicts:
	public/less/app/pages/home/comps-details.less
Fix Input generating order in comps.css
Merge branch 'branch2'

Conflicts:
	public/less/app/pages/home/comps-details.less