Remove,edit and commented minor issues.
Resolve conflict.
Merge branch 'master' of https://github.com/ULE-Bank/brockerageSpring