Merge pull request #4 from ruudvanderweijde/master

latest nikic version + declaration/scope information + test files
Merge remote-tracking branch 'upstream-cwi-swat/master'
added declaration test for decls inside condition statements