fixed manifest, new layouts added (ActivityItemInfo)
merged master