Version 1.5.0
gource sprint n°15
merge branch master