Reorganized the project for Travis and Cocoapods.
Merge branch 'travis_remake'

Conflicts:
	.travis.yml