@add android time controle
Merge branch 'master' of 192.168.1.3:faeris into v1.2