Merge branch 'master' of https://github.com/almondg/cursejar

Conflicts:
	cursejar/core/views.py
	cursejar/cursejar/urls.py

yotam: added charge event handling
pycharm
merge from repo
fix migrations
Merge branch 'master' of https://github.com/almondg/cursejar

Conflicts:
	cursejar/core/views.py
	cursejar/cursejar/urls.py

yotam: fix migration, readd paypal agreement