Whatever changes
Whatever
Merge branch 'master' of https://github.com/qsoetens/ChEOPSJ

Conflicts:

be.ac.ua.ansymo.cheopsj.changerecorders/src/be/ac/ua/ansymo/cheopsj/chan
gerecorders/MethodRecorder.java