safe stubbing
safe test
Merge branch 'source' of github.com:sporto/sporto.github.com into source