milestone 2014-05-20 :: database update, various changes from asana applied