More complete git ignore for Xcode files
Merge branch 'develop' of https://github.com/ARISGames/iOSClient into develop
got rid of a bunch of warnings

more warnings gotten rid of

ridding of more warnings
fixed bug where quick changes in media id in npcvc resulted in broken vc
made splash screens just default gray
fixed wonky media stuff in npc view
viewed npc conversation options now display with background:ARISColorLightGrey and text ARISColorLightBlue
disallowed interaction between button presses in npcviewcontroller- tested by jamming the heck out of the screen to try and get it in a permanantly locked state and could not. could still use some more testing, though
reduced effect of disabling interaction
fix for disabling interaction- accidentally left out a line
Update gitignore
Bump version