Merge branch 'master' of https://github.com/CurtiniOSGroup/JohnTonkin2013

Conflicts:
	John Tonkin/John Tonkin/Base.lproj/Main.storyboard
	John Tonkin/John Tonkin/JTSirenViewController.h
	John Tonkin/John Tonkin/JTSirenViewController.m