I1: Adding post
Merge branch 'master' of github.com:Qlio/Changes into I1_news_feed_page

Conflicts:
	NewsFeed/forms.py
	NewsFeed/templates/NewsFeed/news.html
	NewsFeed/views.py
I1: merge
Merge branch 'master' of github.com:Qlio/Changes into I1_news_feed_page

Conflicts:
	NewsFeed/templates/NewsFeed/news.html
I1: html indent
I1: Adding post fixed
I1: Fixed ajax post
I1: Fixed comment
I8: user profile
I7: navbar added
I7: Fixed nav bar
I7: removed Images
Merge branch 'I7_nav_bar' of github.com:Qlio/Changes

Conflicts:
	static/javascripts/packed.js
I8: User id
I8: User id filter
master coffee change
Fixed post and comment share print
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