fix #14 adding nginx upstream state support
correcting fields order
Fixing merge with master
Beautify domains and upstream