Final before app store submission 05012014
merge conflict fix