Merge branch 'master' into develop
Merge branch 'develop' of github.com:hiidef/hiicart into develop
Merge branch 'hotfix/shiftjis_on_paypal' into develop
Merge branch 'hotfix/veritrans_total_decimal' into develop
Merge branch 'hotfix/enhance_paypal_decoding' into develop
Update for Django 1.6, plus flake8 the affected files
Merge branch 'release/django1.6'
Merge branch 'master' of ssh://github.com/hiidef/hiicart