Updated with autolayout category on THViewController
added specta/expecta test podfiles and pbxproj, with merge conflicts resolved