Added functional as new kinship
Added remove_avatar option to users...
Fixes in user avatar remove checkbox [ci skip]
Added job _unlink_ to users...
Dependencies updated
Newrelic rpm updated
Fixed newrelic yanked
Allow as public and private news
Rails upgrade to 3.2.12 and Bootstrap to 2.3.0
Merge ../x0y0

Conflicts:
	Gemfile.lock
Course help text _improved_
No more NewRelic RPM beta =)
Added embedded authentication
Merge branch 'master' into news_tags

Conflicts:
	db/schema.rb
Embedded Authentication