weekend update
Merge branch 'development' of github.com:climbingcode/bam- into development
Completed merge conflict resolution.