pulled in master (no develop)
updated wagn gem
regenerate manifest
red commit sweep
fixed migrate.rb merge issue