My changes

Some non-minor changes in the index file
Merge remote-tracking branch 'origin/master'

Conflicts:
	savy/build/classes/savy/JsonProcessor.class
	savy/build/classes/servlet/FileCounter.class
Merge remote-tracking branch 'origin/master'

Conflicts:
	savy/build/classes/savy/JsonProcessor.class
	savy/build/classes/servlet/FileCounter.class
Merge branch 'master' of https://github.com/vcedeno/savy

Conflicts:
	savy/WebContent/index.html
Merge branch 'master' of https://github.com/vcedeno/savy