Fix minor UI bug.
Add sensible default outer margin for alt text mode.
Add background color option.
Merge branch 'dev' of github.com:jaredsinclair/JTSImageViewController into dev
Move optional color logic to prevent possible flicker.
Tweak angular resistance.
Clean up method names.
Clean up flags, options.
Fix merge conflict.
Update podspec to 1.2.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Source/JTSImageViewController.h
	Source/JTSImageViewController.m
Workaround for iOS7, running an iPhone app on an iPad

When running an app targeted only for iPhone, there is an bug in iOS 7
when calling [view snapshotViewAfterScreenUpdates:YES] or
[view drawViewHierarchyInRect:rect afterScreenUpdates:YES].
After this call all views are misaligned.
see www.openradar.me/15909891