JK-26 add new items in my bag
  - my bag html fix
  - views fix
OpenShift DB update

update db connection information for Openshift
OpenShift DB update

OpenShift DB update
Merge branch 'develop' into kaykisizcom

Conflicts:
	member/views.py
 new migration fix
 -added migration for order model
 -new translateds added
Merge branch 'develop' into kaykisizcom
  JK-25 add new order information
  - 0012 migration added
  - views fix
  -model fix
  -forms fix
  -my_bag fix
  -new order added
Merge branch 'develop' into kaykisizcom

Conflicts:
	member/forms.py
	member/templates/new_order.html
Merge remote-tracking branch 'origin/kaykisizcom' into kaykisizcom
  JK-25 add new order information
  - 0012 migration added
  - views fix
  -model fix
  -forms fix
  -my_bag fix
  -new order added
  JK-25 add new order information
  - 0012 migration added
  - views fix
  -model fix
  -forms fix
  -my_bag fix
  -new order added
  -urls fix
Merge branch 'develop' into kaykisizcom

Conflicts:
	jackalprojects/settings.py
	member/urls.py
  JK-25 add new order information
  - 0012 migration added
  - views fix
  -model fix
  -forms fix
  -my_bag fix
  -new order added
  -urls fix
  JK-25 add new order information
  - 0012 migration added
  - views fix
  -model fix
  -forms fix
  -my_bag fix
  -new order added
  -urls fix
 JK-41 sends and comes shipping
 -updated send and comes shipping page
 -new page send cargo no and btc adress
 -added view
 -added template
 -added url
 JK-26 bug fix my_bag
 -fixed:ascii code error
 -fixed:address field name (adress)
 JK-36 Sorry Page
 -view added
 -template added
 -url added
 -trans added
  JK-40 Şikayet Sayfası
  - views fix
  -model fix
  -forms fix
  -my_bag fix
  -after sale complaint added
  -my bag fix
  -new order fix
  -urls fix
 JK-26 my bag fix
 -created bag operations
 -updated bag methods
 -updated template
 JK-26 my bag expires
 -30 minutes expires added