Repeated
Merge branch 'develop' of https://github.com/Make-Magazine/makerapp into develop