galaxys2-common: add/update resources

PS2: Merging time!

Change-Id: Idd18890c028acb90b111a5f79e886e3a0674ef3b
Merge branch 'cm-10.1' into martincz