Intellisense

The unstable is already merged in the intellisense branch and conflicts are resolved. 
The goals is to have the intellisense branch into the master. Don't know if this is the route?
@Smuldr could you QA and merge?