clean geneec
clean geneec1
Merge branch 'tao' into sprint10
Merge branch 'sprint10' of https://github.com/puruckertom/ubertool_src into sprint10
ec2 rest ready
update internal ip
update rest geneec
dust batching changes

nto sprint10

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.