Note_formats and test user added
Merge branch 'master' of github.com:spilist/dreamcoach