I1: Allowing comment on post (unfinished)
I1: Removed own comment app
I1: Ajax comment
Merge branch 'master' of github.com:Qlio/Changes into I1_news_feed_page

Conflicts:
	Auth/migrations/0001_initial.py
	Changes/urls.py
I1: Implemented code
I1: comment
Merge branch 'I1_news_feed_page' of http://github.com/Qlio/Changes into I1_news_feed_page

Conflicts:
	Auth/migrations/0001_initial.py
Merge branch 'master' of http://github.com/Qlio/Changes into I1_news_feed_page

Conflicts:
	Changes/settings.py
	Changes/urls.py
Merge branch 'I1_news_feed_page' of github.com:Qlio/Changes into I1_news_feed_page

Conflicts:
	NewsFeed/models.py
	NewsFeed/templates/NewsFeed/news.html
	NewsFeed/views.py
	static/coffee/news_feed.coffee
	static/javascripts/packed.js
Merge branch 'master' of github.com:Qlio/Changes into I1_news_feed_page
Merge branch 'master' of github.com:Qlio/Changes into I1_news_feed_page

Conflicts:
	Changes/urls.py
I1: merge
I1: Fixed ajax error
I1: Fixed migration error
I1: Fixed migrate files
Merge branch 'master' of http://github.com/Qlio/Changes into I6_group_section

Conflicts:
	Changes/urls.py
	NewsFeed/forms.py
	NewsFeed/models.py
	NewsFeed/templates/NewsFeed/news.html
	NewsFeed/views.py
	static/javascripts/packed.js
	templates/base.html