old changes
conflict resolved
Merge branch 'master' of github.com:iPlantCollaborativeOpenSource/atmosphere
Merge branch 'master' of github.com:iPlantCollaborativeOpenSource/atmosphere
Merge branch 'master' of github.com:iPlantCollaborativeOpenSource/atmosphere
Merge branch 'master' of github.com:iPlantCollaborativeOpenSource/atmosphere
Merge branch 'master' of github.com:iPlantCollaborativeOpenSource/atmosphere
CAS logout is now optional, described by UI thanks to cjlarose && amercer1
Merge branch 'master' of github.com:iPlantCollaborativeOpenSource/atmosphere