Lots of modifications !!!
Merge branch 'master' of github.com:QwinixLabs/q-projects

Conflicts:
	app/models/user.rb
	app/views/admin/clients/_show.html.erb
	app/views/admin/project_links/_show.html.erb
	app/views/admin/projects/_show.html.erb