general login added
 something else!
Merge remote-tracking branch 'origin/master'

Conflicts:
	crm/views.py
just images have problem!!!
Merge remote-tracking branch 'origin/master'

Conflicts:
	fnc/functions.py
	nikbad/urls.py
	wiki/views.py
just images have problem!!!