Entity class created
Entity controller created
Bean class created
Entity class created
Entity controller created
Bean class created
Merge origin/master