getting ready to pull github changes
Merge branch 'master' of github.com:antolikjan/mozaik
Merge branch 'master' of github.com:antolikjan/mozaik
Merge branch 'master' of github.com:antolikjan/mozaik
further optimization of the connector code, correct handling of contrast and correct handling of blanks and background_luminance
finished simplifcation and unification of queries
resoleved conflicts
several changes to make plotting more reproducible
just to be able to pull changes in trunk
Merge branch 'master' of github.com:antolikjan/mozaik
adjusted mozaik to pyNN changes that speed up execution and resolve memory leaks
commiting to allow pull
unification of query system
to be able to merge
Merge branch 'master' of github.com:antolikjan/mozaik
added gratings with eyemovement experiment
few bugs corrected due to query changes, and some analysis added
deleted NeuroTools code
resolved marge conflicts
final fixes