linted Merge branch 'master' of https://github.com/Nimzor/jquery-viewport
linted
Merge branch 'master' of https://github.com/Nimzor/jquery-viewport

Conflicts:
	jquery.viewport.js

WorkHorseIndustries/jquery-viewport,Nimzor/jquery-viewport