Git ignore virtualenv, local settings and pyc files
Merge branch 'master' of github.com:redapesolutions/jatomidjango
fab file issue
test fahime
Merge branch 'develop' of http://github.com/redapesolutions/jatomidjango into develop

Conflicts:
	jatomi/templates/membership/manage.html
Merge branch 'develop' of http://github.com/redapesolutions/jatomidjango into develop