resolved merge conflicts
Merge branch 'master' into medaxion