Merging changes from launch manually
Basic balance page functioning for purchases
Added payments + Payment overview page
Merge branch 'refs/heads/master' into launch

Conflicts:
	app/views/purchases/overview.html.erb