Merge pull request #13 from dapetcu21/master

Work on settings pane
Merge pull request #14 from dapetcu21/master

Work on Master-Detail controllers & bugfixes
Merge pull request #15 from dapetcu21/master

Merged content from Leo