Bug fix inline components (action icons disappeared after inline-submit).
Merge branch 'master' of git://github.com/nursix/eden
& provide an alternative format to import demographic_data
Merge branch 'master' of git://github.com/flavour/eden