Auto-layout in controller

Scrollview, auto-layout
Merge branch 'OrdineStyleCollision' of https://github.com/LuizFernandoCirigliano/TwoAndAHalfGame into OrdineStyleCollision

Conflicts:
Controller/GameMultipeerTest.xcodeproj/project.pbxproj
Merge branch 'OrdineStyleCollision' of https://github.com/LuizFernandoCirigliano/TwoAndAHalfGame into OrdineStyleCollision

Conflicts:
	Controller/GameMultipeerTest.xcodeproj/project.pbxproj
Merge branch 'OrdineStyleCollision' of https://github.com/LuizFernandoCirigliano/TwoAndAHalfGame into OrdineStyleCollision

Conflicts:
	Controller/GameMultipeerTest.xcodeproj/project.pbxproj
	Server/testCocos/Connection.m