Scratchpad

- [x] merge master
- [x] fix conflicts
- [x] fix jshint issues