ios app
Merge branch 'master' of https://github.com/AcklenAvenue/DatafestHackathon2013-SPS

pull
Merge branch 'master' of https://github.com/AcklenAvenue/DatafestHackathon2013-SPS

pull rene
some modifications to ios