Merge pull request #18 from BuckyFullerInst/incoming

Merging incoming relation into overall BFI Master
Merge pull request #20 from kidat/master

Syncing up master branches
prep commit
Merge branch 'no_rel_add'
Bringing into master:x

exi
exit
vim sucks
fulakj'
Merge pull request #6 from BuckyFullerInst/dashboard_ui

Working on Challenge Dashboard, making payments window work
trying to wade through payments dashboard ui setup

need to test automatic deletion of app entityform on autopay payment
testing out process of entering
Merge pull request #24 from kidat/dashboard_ui

consolidating dashboard_ui into master