Merge branch 'master' into dev
Merge branch 'master' of https://github.com/devcongress/devcongress.com into dev
Merge branch 'dev'
Merge branch 'master' of https://github.com/devcongress/devcongress.com