formatting, reports view, test controller method
Merge branch 'master' of https://github.com/Congover/warehouse