Merge branch 'master' into sprint1
Merge branch 'sprint1' of https://github.com/Sawash/hackathon-2014-ios into sprint1