I6: Bla bla
I6: group membership
I6: group membership
I6: group membership
Merge branch 'I6_group_section' of http://github.com/Qlio/Changes into I6_group_section

Conflicts:
	NewsFeed/forms.py
I8: user profile
I8: User id
I8: User id filter
Merge branch 'master' of github.com:Qlio/Changes into I8_user_profile

Conflicts:
	NewsFeed/forms.py
	NewsFeed/models.py
	NewsFeed/templates/NewsFeed/news.html
	NewsFeed/urls.py
	NewsFeed/views.py
I8: Merged
I8: Fixed some errors
I8: Fixed urls files
Merge branch 'I8_user_profile' of http://github.com/Qlio/Changes