minor changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	savy/WebContent/index.html
fixed changes with hack for display
Merge branch 'master' of https://github.com/vcedeno/savy