Merge remote-tracking branch 'giri/master'

Conflicts:
	AppleRetail/apple/views.py