Final before app store submission 05012014
merge conflict fix
merge fix
got chat more sensetive