Changes

tsk68-88 Adds cancel event fuction to rest.
Adds missed dataset for capitalDistances Modifies missed cleanup script
for CapitalDistances and Capital tables Modifies rest EventResource to
add the cancel fuction by post Add test to EventResource cancel function

tsk90 Updates basic search to include the city of residence while logged
in
Updates the basic search functionality to order the events taking into
account the city of residence of the logged in user. Also, modifies the
controller of the jsf view to use this.