Merge branch 'master' into newformat
Merge branch 'master' of github.com:bootstrapworld/curr