updated timer
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of
ssh://git@github.com/ProjectRipple/Ripple-Cloud.git

Conflicts:
	Directory Service - Ripple - Server/src/ds/ripple/server/HWServer.java
Merge branch 'master' of ssh://git@github.com/ProjectRipple/Ripple-Cloud.git
updated pub alive method