Initial fork refactor

Update spring to v4
commented dependencies
.gitignore updated
template descriptor updated