Merge branch 'master' of /home/masoud/parsidan/parsidan with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	parsidan/forms/auth/__init__.py
#70 Done