dAlert merge

dAlert is the main android project folder. you can ignore the rest.