Added method to see if a viewController class was present on the navstack.
Set the default color of the SDFormFieldContainer separator to the iOS default value.
Merge branch 'master' into rx-integration
Added a check before resetting a timer to ensure that a timer pending execution isn't reset. This gives time for a backgrounded app to process timers properly before the UI can reset them.
SDDataMap: Added "modelDidLoad" protocol method
Add kSecAttrAccessibleWhenUnlocked attribute to our keychain entries when saving and updating
Add kSecAttrAccessibleWhenUnlocked attribute to our keychain entries when saving and updating
Change keychain access to kSecAttrAccessibleWhenUnlockedThisDeviceOnly
Merge branch 'refs/heads/rx-integration'

Conflicts:
	Source/Security/SDKeychain.m
Remove all instances of NSLog, replacing with SDLog
Merge pull request #77 from walmartlabs-wmusiphone/master

Stuff
Merge pull request #76 from walmartlabs-asdaios/master

i learned how to spell.
Added isValidWithRegex: string method. Added tests, and re-implemented isValidZIPCode with it.
Fixed an issue with sizing the bar controls. Disabled for now on iPad. I will need to elaborate on the strategy a little.
Added support for a secure read only display of a credit card.
Fixed the string function to secure a credit card number.
Made the setSecureField work repeatedly to mask field.
Don't check to see if image is the same when setting the placeholder since this doesn't work with reused cells if the field is in a cell.
Merge remote-tracking branch 'upstream/master'