#initialized spots and activities, added paperclip, geocoder to Gemfile.
Merge branch 'master' of github.com:aserafin/inspottle

Conflicts:
	Gemfile
	Gemfile.lock