I understand the concept and behaviour behind having a master but since we are prototyping it will be nice to edit the components of the master page in a child/ inherited page. Perhaps the behaviour could be modified:
1. If a component is locked in master page then it cannot be modified
2. If a compoenent is not locked in master page then the component should be modifiable.

Cheers,
Hemal