Merge branch 'qa' into development
added fields and a button on the grid.
few loose ends
I dont know but theres a ton of shit in here so I better commit
filtering trainers
looks like some domain and db changes
merge conflict
Merge branch 'inactivate' into development
finishing up new session management
Merge branch 'development' into qa