Assets: Add Condition as a Filter/Report Axis, fix prepop of
Location/Condition
Merge branch 'master' of git://github.com/flavour/eden
Merge branch 'master' of git://github.com/flavour/ifrc