yotam:

- add nvd3 js and css to static files
- comment out the Member insights pilot
- fetchfeedstatuses_v2 start (uncompleted)
yotam:

- changes in .gitignore
 fixup to .gitignore
yotam:

- merge from origin
yotam:

- gitignore stuff
Merge branch 'newmodel' into vagrant

Conflicts:
	.gitignore
- Merge branch 'newmodel' into vagrant
- Fake changes to local.py
Conflicts:
	.gitignore
yotam: fetchfeedstatuses_v2, and all relevant changes in db and views. Unstable.
yotam:

- add for facebook_status field is_comment, logic for deciding whether True or False
- add update command for setting is_comment field

- update  data_fixture_facebook_feeds with new feeds
yotam:

- changes to set_is_comment logic. Should work correctly at the moment
Merge remote-tracking branch 'origin/newmodel' into newmodel

Conflicts:
	kikar_hamedina/core/views.py
Fix searchgui bugs

In SearchView wrote get_parsed_request() and parse_q_object(). each of them runs in both get_queryset() and get_context_data().
yotam:

- Minor change to set_is_comment logic.
Merge branch 'newmodel' of https://github.com/yotammanor/kikar-hamedina into newmodel
Merge branch 'agamrafaeli-newmodel' into newmodel

Conflicts:
	kikar_hamedina/core/templates/core/facebook_status.html
	kikar_hamedina/core/views.py
yotam (ft. agam):

- bug fix to add tag with ajax
yotam:

- create a manager to automatically filter statuses for is_comment=true
- clean up after task.
yotam:

- minor fix-ups
yotam:

- fetchfeedproperties_v2
- follow-up changes in fetchfeedstatuses_v2
- updates in csv and json data_fixtures for facebook_feeds
- core template changes to follow on changes in model
yotam:

- rename fetchfeedproperties_v2 and fetchfeedstatuses_v2 to used name, deprecating v1 versions.
- fixing vagrantfile, adding a createsuperuser command --username admin