test commit
Merge branch 'master' of github.com:tuulos/bd-toydata-nokia-techtalk-dec2012