Merge branch 'master' of github.com:dimagi/casexml into commtrack
initial sketch of server side models for stock data
bad import
simplify models
remove default date, change report field, add commented out fields