iOS6 changes
Merge branch 'master' of https://github.com/Stryker/NV-AIS-Competetive