Merge branch 'master' of /Users/henrique/Projects/Sites with conflicts.
Merge remote-tracking branch 'origin/master'
Included coveralls coverage report