Adding relationships
Added
====
Login Page (login, logout)
User Management(basic some validation)
Groups ( basic, add_user in  edit view)
Local Management(basic)
Added functionality to uplaod files, but not added to any view
working on users
User/group/local working on
maintain of group, local, user done
Merge branch 'branch_mrosalesdiaz'

Conflicts:
	app/assets/stylesheets/application.css
	app/models/group.rb
	app/views/groups/_form.html.erb
	app/views/groups/index.html.erb
	app/views/groups/show.html.erb
	app/views/layouts/private.html.erb
	app/views/locals/_form.html.erb
	app/views/users/_form.html.erb
	db/migrate/20130606042035_add_default_data.rb
	db/schema.rb