some cleanup
Merge branch 'master' of 172.16.8.183:smoke

Conflicts:
	dev/js/api_object.js