My Mac OS X version is different, it changes inside a xib every time I open it
Merge remote-tracking branch 'oswaldo/master'
Merge remote-tracking branch 'oswaldo/master'
Merge remote-tracking branch 'oswaldo/master'
Merge remote-tracking branch 'oswaldo/master'
Merge remote-tracking branch 'oswaldo/master'
Tinted HintsPopupContoller

Semantic change in color (#define removed and defined a new category to provide the colors with meaning for the app)
Merge remote-tracking branch 'oswaldo/master'
"i" button in CardView didn't work
Minor cosmetic changes in popups
Merge remote-tracking branch 'oswaldo/master'

Conflicts:
	IrregularVerbs/HomeViewController.xib
Small  changes in Info Popup
Merge remote-tracking branch 'oswaldo/master'
Now using UIAppearance to set NavigationBar, UIBarButtonItem and UISegmentedControl text and color
Fixed NavigationBar title shadow in HomeViewController
Light in iOS comes from the top (Read more: http://flyosity.com/tutorial/crafting-subtle-realistic-user-interfaces.php)
UISwitch onColor changed to TURQUESA_TINT
Changed xib colors of search bar and segmented controls to default (they are now set in code), because they weren't the same color as the NavigationBar
CardsTableViewController cleaning
Deleted color definition file trying to merge
Merge branch 'rafamaster' into colors
Merged