- added configuration pages
- added Settings Beans
Merge origin/master