test evni setup and basic setup
Merge branch 'master' of https://github.com/rshiva/localnews into testing

Conflicts:
	.rspec
	Gemfile
	Gemfile.lock
	Guardfile
	spec/models/user_spec.rb
	spec/spec_helper.rb
google maps autocomplete address javascript added
added username and login option via username and email