push ati
Revert f69ca9d..8269797

This rolls back to commit f69ca9d74c6ab7a607082bdc4e4843f10624b238.
Merge branch 'master' of https://github.com/DP2iOS2014/darsapp

Conflicts:
darsapp/Base.lproj/Main_iPhone.storyboard
Merge branch 'master' of https://github.com/DP2iOS2014/darsapp