Pushing all updates to security

Fixed import statements in common
used jdk 1.7 like told

fixed spacing in cryption