Merge branch 'develop'
Having problems getting a valid file descriptor
Skeletal implementation of a Controller
Work in progress: file permission issues
Fixed merge conflict
Code refactoring with respect to Builder and Context