I6: git pull
Merge branch 'master' of http://github.com/Qlio/Changes into I6_group_section

Conflicts:
	Changes/urls.py
I6: merge i4
Merge branch 'I4_registration_section' of http://github.com/Qlio/Changes into I6_group_section

Conflicts:
	Changes/urls.py
I6: add files
I6: gradd post filter
I6: groupId negj baigaa
I6: nothing
Merge branch 'master' of http://github.com/Qlio/Changes into I6_group_section

Conflicts:
	Changes/urls.py
	static/css/sass/screen.scss
	static/css/stylesheets/screen.css
	static/javascripts/packed.js
I6 nothing
nothing
I6: Post desing
Merge branch 'master' into I6_group_section

Conflicts:
	Changes/urls.py
Merge branch 'master' of http://github.com/Qlio/Changes into I6_group_section
I6: Added jquery.js
I6: Removed unneeded files
I6: public and primary post.
I6: hide group_id
Merge branch 'master' of http://github.com/Qlio/Changes into I6_group_section

Conflicts:
	Auth/templates/Auth/login.html
	Auth/templates/Auth/register.html
	static/css/sass/screen.scss
	static/css/stylesheets/screen.css
I6:design changes