Working 2.0
Merge origin/master
Working 2.0
Working 2.2 with refactoring, commenting.. of curator and profiler
Working 2.5 with refactoring, commenting of all classes