- merge kburd and jtrain changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	por/__main__.py
	por/cart.py
	por/entity.py
	por/ruby.py
Merge branch 'master' of https://github.com/rozifus/TeamStrong13_4