OSEF
Merge branch 'master' of https://github.com/josealbea/AdCloudTestApplication

Conflicts:
	Demos/MFSideMenuDemoStoryboard/MFSideMenuDemoStoryboard/en.lproj/MainStoryboard.storyboard