moved 5 var STATE_ constants into STATE { ... }
alter formatting of STATE{}
clean up merge conflicts
Merge branch 'smtp_client2' into smtp_client

Conflicts:
	smtp_client.js