Code cleaning and refactoring
Merge branch 'master' of https://github.com/wicketstuff/core.git