w2

w2
Merge branch 'master' of https://github.com/aommiez/SatitCMU-iOS

Conflicts:
	SatitCMU.xcodeproj/project.xcworkspace/xcshareddata/SatitCMU.xccheckout