Initial commit

Contains the whole eclipse project folder from my workspace
Merge branch 'maestro'