merged with master
Merge branch 'master' of github.com:codurance/site