Merge fixed
Merge branch 'develop' of github.com:Benn83uk/SpaceAppsChallenge2014 into develop