Gingerbread branch

Please merge fixes are needed to compile. Also the manifest needs to be updated