regular commit
Merge branch 'post-ios7-only' of https://github.com/CraigZheng/CustomImageBoardViewer into post-ios7-only

Conflicts:

CustomImageBoardViewer.xcodeproj/xcuserdata/craig.xcuserdatad/xcdebugger
/Breakpoints_v2.xcbkptlist