Changes for DevFest
Merge branch 'master' of https://github.com/pflammertsma/mobdevcon