Using geolocation
Moving old migration files.
Merge branch 'master' into search_state

Conflicts:
	Gemfile
	Gemfile.lock
	app.rb
	db/20131219153459_create_posts.rb
	db/schema.rb
	public/index.html
	public/js/app.js
	public/js/maps.js