Added comments to managers and beans
Added more comments to the code
Added modules documentation
Merge with master
Merge with master again