Fixed bug with admins not being able to edit scouts
Added troop selection to scouts
Fixed merge conflict
Merge branch 'gmcquie-master'
Admins can edit users
Merge branch 'master' of https://github.com/dmurtari/MBUOnline