Commit before merge
Commit before merge
Merge branch 'master' of https://github.com/kylelol/KnightNews_iOS into kylelol-master

Conflicts:
	KnightNews.xcworkspace/xcuserdata/jjvg.xcuserdatad/UserInterfaceState.xcuserstate
Commit before merging to maseter.
Commit before merging Kylelol.
Merge branch 'kylelol-master'

Conflicts:
	KnightNews.xcworkspace/xcuserdata/jjvg.xcuserdatad/UserInterfaceState.xcuserstate
Turned off networkActivityIndicator once requests have completed.
Commented out NSLog statements.
Truncated tail of the stories preview text in KKNewsViewController.
Update .gitignore
Fixed Parse error message that would appear in the Console.
Fixed more Parse remote notification errors that would appear on iOS8.
commit
Merge branch 'master' of https://github.com/kylelol/KnightNews_iOS into kylelol-master
Turned off network activity indicator once network activity completed.
Rid of extraneous variables in JJVRootViewController.
Commite before merge.
Merge branch 'kylelol-master'

Conflicts:
	KnightNews.xcodeproj/project.pbxproj
	KnightNews.xcworkspace/xcuserdata/jjvg.xcuserdatad/UserInterfaceState.xcuserstate
	KnightNews/KKNewsAPI.m
	KnightNews/KKNewsViewController.m
JJVRootViewController now uses JJVReaderViewController.
Quick fix to allow embedded links to open from within JJVReaderViewController.