Fixing layout for iOS 7
Fixing some Android bugs

The Add button text was wrapping at the fixed size.

Added the missing architectures.
Fixing the target version for the Android sample.
Merge branch 'dev-master'