updates
updates
removed cocoapods
updates
updated .gitignore
Merge branch 'no-pods' into development
Merge branch 'development'

Conflicts:
	scripts/install
updates