actual version
Merge branch 'master' of git@github.com:andresperezl/heartbooth.git

Conflicts:
	src/edu/usf/csee/heartbooth/util/WSClient.java