Merge branch 'master' of github.com:tangosource/trainees-2013-H2-3 into ...

...developer_rb