merge
Merge branch 'master' of github.com:dinox/amazonaws

Conflicts:
	loadbalancer.py