aswartz additions
bump version
Merge branch 'anthony_dev' into staging