add gridview
Merge branch 'develop'

Conflicts:
	Conference.xcodeproj/project.pbxproj
	Conference/AppDelegate.m
	Conference/sources/control/detail/MyDetailViewController.h