add localizedString
[Podfile] Point to Cocoapods Specs repo
Merge pull request #18 from scottphc/master

Add customizable cancelBarButtonItem to passcode view controller
Update character view to support initWithFrame
Pod install FBSnapshotTestCase
Rename KIF tests to AutoLock tests
Adjust bullet so it fits character view frame
Create snapshot tests for character view bullet and hyphen
Add horizontal margin to hyphen characters to prevent clipping
Merge pull request #20 from venmo/daz/character_view_snapshot_tests

Add passcode character view snapshot tests
Make passcode view title and character colors configurable
Set passcode view appearance colors each time it is created by a passcode view controller
Resign keyboard on viewWillDisappear
Fix iOS 7 bug where backgroundLockVisible is not being set in time
Merge pull request #27 from venmo/ayanonagon/ios7

Fix iOS 7 bug where backgroundLockVisible is not being set in time
[Podspec] Update to 1.0.4
Merge pull request #22 from venmo/daz/customize_colors

Make passcode view title and character colors configurable
Merge pull request #26 from venmo/daz/resign_keyboard_on_disappear

Resign keyboard on viewWillDisappear
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  [Podspec] Update to 1.0.4
  Fix iOS 7 bug where backgroundLockVisible is not being set in time
  Resign keyboard on viewWillDisappear
  Set passcode view appearance colors each time it is created by a passcode view controller
  Make passcode view title and character colors configurable
  Add horizontal margin to hyphen characters to prevent clipping
  Create snapshot tests for character view bullet and hyphen
  Adjust bullet so it fits character view frame
  Rename KIF tests to AutoLock tests
  Pod install FBSnapshotTestCase
  Update character view to support initWithFrame
  [Podfile] Point to Cocoapods Specs repo
  add localizedString

Conflicts:
	VENTouchLock.xcodeproj/project.pbxproj