Updated to 1.1 branches to use internal and external sdcard