Furniture Prop Ajax
pyc commit
new views commit
maintags
merge commit
Merge remote-tracking branch 'origin/Arian'

Conflicts:
	account/forms.pyc
	account/views.pyc
	inpica/settings.pyc
	inpica/urls.pyc
	main/models.pyc
	main/templatetags/maintags.py
	main/views.py
	main/views.pyc