pulled in master (no develop)
updated wagn gem
regenerate manifest