started revamp of account page for angular.
fixed build. fitnessactivity__ changed to activities__ since related_name was set to 'activities' on FitnessActivity
Merge branch 'refs/heads/master' into angular-migration
down the angular rabbit hole we go
I am my own worst enemy
Merge branch 'refs/heads/master' into angular-migration

Conflicts:
	fitcompetition/models.py
	fitcompetition/urls.py
	fitcompetition/views.py
split the tests into their own package with separate files.  now serving angular.js and jquery from CDN, relying on 1.2.x of angular (legacy).  upgraded angular-ui-bootstrap to latest, tests passing again
updated angular-cookies and angular-resource to 1.2.x (stable, legacy)
account page working like a champ
began stripe integration
retina ready credit card icons
more stripe integration
allow any page to be secure. only force the ones the explicitly require it in urls.py
fixing minification errors
srsly?
credit card transactions working like a champ.  customers and cards are remembered if user checks the box.
fixing angular-slugify so it can be minified.
users are now prompted to put money into the pot before they can join a challenge.
users are now prompted to ante up when joining a challenge of any type or style.