Newsfeed targeting setup
Merge branch 'master' of https://github.com/klvh-mb/MB

Conflicts:
	app/models/User.java