Merge branch 'master' of https://github.com/yotammanor/kikar-hamedina into HEAD

All of agam's changes now merged as well.
Added parties to search capabilities
Search for words and search display

Added the ability to search for text.
On search display screen shows the numbers for the search
Search page added

Complex search page added. Boyaka
Merge branch 'master' of https://github.com/agamrafaeli/kikar-hamedina into agamrafaeli-master

Conflicts:
	kikar_hamedina/core/plain_urls.py
	kikar_hamedina/core/plain_views.py
Merge branch 'agamrafaeli-master' into newmodel

Conflicts:
	kikar_hamedina/core/plain_urls.py
	kikar_hamedina/core/plain_views.py