changed the tests so they are splitted in performance tests and
functional tests.
added some file to ignore
Merge remote-tracking branch 'origin/master'