Playtime
Merge remote-tracking branch 'origin/master'

Conflicts:
	depot/.idea/workspace.xml
	depot/tmp/pids/server.pid
Merge remote-tracking branch 'origin/master'

Conflicts:
	depot/.idea/workspace.xml
	depot/app/controllers/line_items_controller.rb
	depot/app/controllers/store_controller.rb
	depot/app/views/layouts/application.html.erb
Merge remote-tracking branch 'origin/master'
Iteration E3.Playtime2