port to vapi 1.0.4 and code cleanup - wip
Merge branch 'master' into vapi_1_0_4

Conflicts:
	.jshintrc
jshint fixes, add jquery-browser
migration to 1.0.4 - wip