Refactoring 2016

Merged André Anjos requested to merge refactoring_2016-108c4f38 into master

Created by: 183amir

Merge request reports