Merge branch 'master' of git://github.com/flavour/eden
adding timeline to inv_send/inv_req

some minute changes

sqush commit
Merge pull request #431 from hardikj/master

added timeline to the Inventory Shipments (inv_send / inv_recv) module
Merge pull request #433 from ashwyn/master

Fix in msg/schedule_parser
Update Vietnamese translation (thanks to Vietnam Red Cross!)
Cleanup
IFRC template: Enable Vietnamese
No test called search_staff
Merge branch 'master' of https://github.com/VishrutMehta/eden
Bug fix.
Fix inv_rheader for track_items, Tweak SandyRelief menus, Tweak DRMP Map
DRRPP style tweak
Merge branch 'master' of git://github.com/flavour/eden

Conflicts:
	modules/eden/inv.py
Make dl an interactive format, empty profile widgets can be refreshed,
profile map layers refreshed, DRMP: contexts applied to Org/Location
profile pages
Profile iFilter/Context applied to Updates too
Support more aggressivei clustering
Merge branch 'master' of git://github.com/flavour/eden
Cleanup
Datalist Ajax-delete reports the UUID of the deleted record.
Refresh Map layers on AJAX delete in datalists, Update OpenLayers to
current Trunk + Merge SLD Externalgraphic support