Update package json
Use stylus
Merge remote-tracking branch 'origin/develop' into develop