fix associations
cleaned up profile class (and made a mess elsewhere)
work on controllers & views
work on controllers & views
resolve merge conflicts