merge  WaitNote and uploadmanager from harmattan
upload page but broken