Changed testfiles for quickaddparser
Cleaned repo
Fixed mergeconflicts