Merge pull request #13 from dapetcu21/master

Work on settings pane
Merge branch 'master' of https://github.com/leooob/delta-app
Merge pull request #14 from dapetcu21/master

Work on Master-Detail controllers & bugfixes
Resized pictures
Fixed gulp infinite watch loop
Merge pull request #15 from dapetcu21/master

Merged content from Leo
added sections to preserved areas
Merge branch 'master' of github.com:dapetcu21/delta-app