Set dependencies correctly
Merge branch 'master' into set_dependencies_correctly

Conflicts:
	Gemfile.lock
Merge pull request #65 from crowdint/set_dependencies_correctly

Set dependencies correctly