after vegas, preparing for merge
Merge branch 'master' of https://github.com/koroket/MKSTFA

# By Ben-G (1) and koroket (1)
# Via koroket
* 'master' of https://github.com/koroket/MKSTFA:
  tolga merge
  code review III
Getting ready for restructure
Preparing to Merge
Merge branch 'master' of https://github.com/koroket/MKSTFA

# By koroket
# Via koroket
* 'master' of https://github.com/koroket/MKSTFA:
  masa's new TFE commit

Conflicts:
	NetworkCommunication.m
	TFE.xcodeproj/project.pbxproj
	TFE/Base.lproj/Main.storyboard
	TFE/DraggableBackground.m
	TFE/TableViewCell.xib