BISERVER-8427 - Updated Action Based Security for startup roles
Merge pull request #205 from kurtwalker/master

BISERVER-8578
Merge pull request #204 from webdetails/BISERVER-8427

BISERVER-8427 - Updated Action Based Security for startup roles
Merge pull request #206 from kurtwalker/master

BISERVER-8578
BISERVER-8428 - Updated some UI related items
Merge pull request #207 from rmansoor/master

BISERVER-8428 - Updated some UI related items
Don't display conflict dialog if there is a error in REST call
Merge pull request #208 from pentaho-skarmali/biserver-8103_ui_for_blockout_periods

BISERVER-8103
BISERVER-8585 - Update label for inherit permissions
Merge pull request #209 from rmansoor/master

BISERVER-8585 - Update label for inherit permissions
BISERVER-8578 - activating some buttons.  fixing code indent