Refactoring 2016

Merged André Anjos requested to merge refactoring_2016-ef9654df into master

Created by: 183amir

Merge request reports